Add remaining default_route_action subfields to google_compute_region_url_map resource (#6676) (#13063)

* Add `defaultRouteAction.urlRewrite` to `google_compute_region_url_map` resource

* Add `defaultRouteAction.corsPolicy` to `google_compute_region_url_map` resource

* Add `cors_policy` to acceptance test

* Add `defaultRouteAction.faultInjectionPolicy` to `google_compute_region_url_map` resource, update generated test

* Fix bug where `defaultRouteAction.timeout` was incorrectly nested

* Fix misspelled field in acceptance test

* Add `at_least_one_of` logic present in the global version of UrlMap resource

* Update `defaultRouteAction` test to include `timeout` field

* Update `defaultRouteAction` test to include `url_rewrite` field

* Update `defaultRouteAction` test to include `cors_policy` field (excluding regex subfield)

* Add missing `at_least_one_of` entries inside the `defaultRouteAction` property

* Update values used for `url_rewrite` in Url Map tests and examples

* Update values of `host_rewrite` and `path_prefix_rewrite` in acc tests

Signed-off-by: Modular Magician <[email protected]>

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/6676.txt

@@ -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
+```

google/resource_compute_region_url_map.go

@@ -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 {
@@ -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
@@ -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

google/resource_compute_region_url_map_generated_test.go

@@ -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
@@ -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
@@ -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
@@ -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

google/resource_compute_region_url_map_test.go

@@ -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

google/resource_compute_url_map_generated_test.go

@@ -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/"
       }
     }
   }
@@ -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
       }
     }
   }
@@ -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/"
     }
   }
 }
@@ -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
     }
   }
 }
@@ -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}"
@@ -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}"
@@ -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
@@ -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
@@ -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
@@ -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