Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add remaining default_route_action subfields to google_compute_region_url_map resource #13063

Merged
merged 1 commit into from Nov 17, 2022
Merged

Add remaining default_route_action subfields to google_compute_region_url_map resource #13063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions .changelog/6676.txt
View file
Open in desktop
@@ -0,0 +1,12 @@
```release-note:enhancement
compute: added `default_route_action.url_rewrite` field to `google_compute_region_url_map` resource
```
```release-note:enhancement
compute: added `default_route_action.cors_policy` field to `google_compute_region_url_map` resource
```
```release-note:enhancement
compute: added `default_route_action.fault_injection_policy` field to `google_compute_region_url_map` resource
```
```release-note:enhancement
compute: added `default_route_action.timeout` field to `google_compute_region_url_map` resource
```
886 changes: 838 additions & 48 deletions google/resource_compute_region_url_map.go
View file
Open in desktop

Large diffs are not rendered by default.

48 changes: 44 additions & 4 deletions google/resource_compute_region_url_map_generated_test.go
View file
Open in desktop
Expand Up @@ -215,6 +215,46 @@ resource "google_compute_region_url_map" "regionurlmap" {
response_headers_to_remove = ["buzz"]
}
}
url_rewrite {
host_rewrite = "dev.example.com"
path_prefix_rewrite = "/v1/api/"
}

cors_policy {
disabled = false
allow_credentials = true
allow_headers = [
"foobar"
]
allow_methods = [
"GET",
"POST",
]
allow_origins = [
"example.com"
]
expose_headers = [
"foobar"
]
max_age = 60
}
fault_injection_policy {
delay {
fixed_delay {
seconds = 0
nanos = 500
}
percentage = 0.5
}
abort {
http_status = 500
percentage = 0.5
}
}
timeout {
seconds = 0
nanos = 500
}
}

host_rule {
Expand Down Expand Up @@ -361,8 +401,8 @@ resource "google_compute_region_url_map" "regionurlmap" {
nanos = 750000000
}
url_rewrite {
host_rewrite = "A replacement header"
path_prefix_rewrite = "A replacement path"
host_rewrite = "dev.example.com"
path_prefix_rewrite = "/v1/api/"
}
weighted_backend_services {
backend_service = google_compute_region_backend_service.home.id
Expand Down Expand Up @@ -467,8 +507,8 @@ resource "google_compute_region_url_map" "regionurlmap" {
nanos = 750000000
}
url_rewrite {
host_rewrite = "A replacement header"
path_prefix_rewrite = "A replacement path"
host_rewrite = "dev.example.com"
path_prefix_rewrite = "/v1/api/"
}
weighted_backend_services {
backend_service = google_compute_region_backend_service.home.id
Expand Down
51 changes: 47 additions & 4 deletions google/resource_compute_region_url_map_test.go
View file
Open in desktop
Expand Up @@ -551,8 +551,8 @@ resource "google_compute_region_url_map" "foobar" {
nanos = 750000000
}
url_rewrite {
host_rewrite = "A replacement header"
path_prefix_rewrite = "A replacement path"
host_rewrite = "dev.example.com"
path_prefix_rewrite = "/v1/api/"
}
weighted_backend_services {
backend_service = google_compute_region_backend_service.home.self_link
Expand Down Expand Up @@ -657,8 +657,8 @@ resource "google_compute_region_url_map" "foobar" {
nanos = 760000000
}
url_rewrite {
host_rewrite = "A replacement header again"
path_prefix_rewrite = "A replacement path again"
host_rewrite = "stage.example.com" # updated
path_prefix_rewrite = "/v2/api/" # updated
}
weighted_backend_services {
backend_service = google_compute_region_backend_service.home.self_link
Expand Down Expand Up @@ -949,10 +949,30 @@ resource "google_compute_region_url_map" "foobar" {
}
}

timeout {
seconds = 3
nanos = 0
}

url_rewrite {
host_rewrite = "dev.example.com"
path_prefix_rewrite = "/v1/api/"
}

request_mirror_policy {
backend_service = google_compute_region_backend_service.login.id
}

cors_policy {
allow_origins = [ "https://www.example.com" ]
allow_methods = [ "GET" ]
allow_headers = [ "Content-Type" ]
expose_headers = [ "Authorization" ]
max_age = 600
allow_credentials = true
disabled = false
}

weighted_backend_services {
backend_service = google_compute_region_backend_service.login.id
weight = 200
Expand Down Expand Up @@ -1063,11 +1083,34 @@ resource "google_compute_region_url_map" "foobar" {
}
}

# update to be <1 second
timeout {
seconds = 0
nanos = 10000000 # 0.01 seconds
}

# update both values
url_rewrite {
host_rewrite = "stage.example.com"
path_prefix_rewrite = "/v2/api/"
}

# update backend_service field from 'login' to 'home'
request_mirror_policy {
backend_service = google_compute_region_backend_service.home.id
}

# update policy and disable it
cors_policy {
allow_origins = [ "https://xylophone.example.com", "https://www.example.com" ]
allow_methods = [ "PUT", "GET" ]
allow_headers = [ "Content-Type" ]
expose_headers = [ "Authorization" ]
max_age = 600
allow_credentials = true
disabled = true
}

# Change various fields - marked with comments
weighted_backend_services {
backend_service = google_compute_region_backend_service.login.id
Expand Down
4 changes: 2 additions & 2 deletions google/resource_compute_url_map_generated_test.go
View file
Open in desktop
Expand Up @@ -406,8 +406,8 @@ resource "google_compute_url_map" "urlmap" {
nanos = 750000000
}
url_rewrite {
host_rewrite = "A replacement header"
path_prefix_rewrite = "A replacement path"
host_rewrite = "dev.example.com"
path_prefix_rewrite = "/v1/api/"
}
weighted_backend_services {
backend_service = google_compute_backend_service.home.id
Expand Down
40 changes: 20 additions & 20 deletions google/resource_compute_url_map_test.go
View file
Open in desktop
Expand Up @@ -606,8 +606,8 @@ resource "google_compute_url_map" "foobar" {

default_route_action {
url_rewrite {
host_rewrite = "my-new-host"
path_prefix_rewrite = "my-new-path"
host_rewrite = "dev.example.com"
path_prefix_rewrite = "/v1/api/"
}
}
}
Expand Down Expand Up @@ -654,8 +654,8 @@ resource "google_compute_url_map" "foobar" {

default_route_action {
url_rewrite {
host_rewrite = "a-different-host"
path_prefix_rewrite = "a-different-path"
host_rewrite = "stage.example.com" # updated
path_prefix_rewrite = "/v2/api/" # updated
}
}
}
Expand Down Expand Up @@ -683,8 +683,8 @@ resource "google_compute_url_map" "foobar" {

default_route_action {
url_rewrite {
host_rewrite = "my-new-host"
path_prefix_rewrite = "my-new-path"
host_rewrite = "dev.example.com"
path_prefix_rewrite = "/v1/api/"
}
}
}
Expand All @@ -711,8 +711,8 @@ resource "google_compute_url_map" "foobar" {

default_route_action {
url_rewrite {
host_rewrite = "a-different-host"
path_prefix_rewrite = "a-different-path"
host_rewrite = "stage.example.com" # updated
path_prefix_rewrite = "/v2/api/" # updated
}
}
}
Expand Down Expand Up @@ -1054,8 +1054,8 @@ resource "google_compute_url_map" "foobar" {
nanos = 750000000
}
url_rewrite {
host_rewrite = "A replacement header"
path_prefix_rewrite = "A replacement path"
host_rewrite = "dev.example.com"
path_prefix_rewrite = "/v1/api/"
}
weighted_backend_services {
backend_service = "${google_compute_backend_service.home.self_link}"
Expand Down Expand Up @@ -1173,8 +1173,8 @@ resource "google_compute_url_map" "foobar" {
nanos = 760000000
}
url_rewrite {
host_rewrite = "A replacement header updated"
path_prefix_rewrite = "A replacement path updated"
host_rewrite = "stage.example.com" # updated
path_prefix_rewrite = "/v2/api/" # updated
}
weighted_backend_services {
backend_service = "${google_compute_backend_service.home.self_link}"
Expand Down Expand Up @@ -1288,8 +1288,8 @@ resource "google_compute_url_map" "foobar" {
nanos = 750000000
}
url_rewrite {
host_rewrite = "A replacement header"
path_prefix_rewrite = "A replacement path"
host_rewrite = "dev.example.com"
path_prefix_rewrite = "/v1/api/"
}
weighted_backend_services {
backend_service = google_compute_backend_service.home.self_link
Expand Down Expand Up @@ -1403,8 +1403,8 @@ resource "google_compute_url_map" "foobar" {
nanos = 760000000
}
url_rewrite {
host_rewrite = "A replacement header updated"
path_prefix_rewrite = "A replacement path updated"
host_rewrite = "stage.example.com" # updated
path_prefix_rewrite = "/v2/api/" # updated
}
weighted_backend_services {
backend_service = google_compute_backend_service.home.self_link
Expand Down Expand Up @@ -1508,8 +1508,8 @@ resource "google_compute_url_map" "foobar" {
nanos = 750000000
}
url_rewrite {
host_rewrite = "A replacement header"
path_prefix_rewrite = "A replacement path"
host_rewrite = "dev.example.com"
path_prefix_rewrite = "/v1/api/"
}
weighted_backend_services {
backend_service = google_compute_backend_service.home.self_link
Expand Down Expand Up @@ -1613,8 +1613,8 @@ resource "google_compute_url_map" "foobar" {
nanos = 760000000
}
url_rewrite {
host_rewrite = "A replacement header updated"
path_prefix_rewrite = "A replacement path updated"
host_rewrite = "stage.example.com" # updated
path_prefix_rewrite = "/v2/api/" # updated
}
weighted_backend_services {
backend_service = google_compute_backend_service.home2.self_link
Expand Down