diff --git a/build/terraform b/build/terraform index 9513ee956d17..061107bc5921 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit 9513ee956d171c4346e3b601238da49d5f3e28fc +Subproject commit 061107bc592185db0b2dc0abca089d62ce091cc1 diff --git a/build/terraform-beta b/build/terraform-beta index fdaf5b7116b4..e5fb5ef73647 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit fdaf5b7116b48479c858fb5cc9b02bfec7a9b7a3 +Subproject commit e5fb5ef736475f01b8d3629631393a0ef4b0f980 diff --git a/products/compute/api.yaml b/products/compute/api.yaml index 0508cbff4ea6..a047c8b5d937 100644 --- a/products/compute/api.yaml +++ b/products/compute/api.yaml @@ -6594,6 +6594,7 @@ objects: create the disk. Provide this when creating the disk. - !ruby/object:Api::Resource name: 'RegionUrlMap' + min_version: beta kind: 'compute#urlMap' base_url: projects/{{project}}/regions/{{region}}/urlMaps collection_url_key: 'items' diff --git a/products/compute/terraform.yaml b/products/compute/terraform.yaml index 1d8fbc4fac71..75f1ac9c6676 100644 --- a/products/compute/terraform.yaml +++ b/products/compute/terraform.yaml @@ -1220,6 +1220,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides examples: - !ruby/object:Provider::Terraform::Examples name: "region_url_map_basic" + min_version: beta primary_resource_id: "regionurlmap" vars: region_url_map_name: "regionurlmap" diff --git a/templates/terraform/examples/region_url_map_basic.tf.erb b/templates/terraform/examples/region_url_map_basic.tf.erb index 7fe456aafe17..c9b175201427 100644 --- a/templates/terraform/examples/region_url_map_basic.tf.erb +++ b/templates/terraform/examples/region_url_map_basic.tf.erb @@ -1,7 +1,9 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { + provider = "google-beta" + region = "us-central1" + name = "<%= ctx[:vars]['region_url_map_name'] %>" description = "a description" - region = "us-central1" default_service = "${google_compute_region_backend_service.home.self_link}" @@ -33,8 +35,10 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { } resource "google_compute_region_backend_service" "login" { - name = "<%= ctx[:vars]['login_region_backend_service_name'] %>" + provider = "google-beta" region = "us-central1" + + name = "<%= ctx[:vars]['login_region_backend_service_name'] %>" protocol = "HTTP" timeout_sec = 10 @@ -42,8 +46,10 @@ resource "google_compute_region_backend_service" "login" { } resource "google_compute_region_backend_service" "home" { - name = "<%= ctx[:vars]['home_region_backend_service_name'] %>" + provider = "google-beta" region = "us-central1" + + name = "<%= ctx[:vars]['home_region_backend_service_name'] %>" protocol = "HTTP" timeout_sec = 10 @@ -51,8 +57,10 @@ resource "google_compute_region_backend_service" "home" { } resource "google_compute_region_health_check" "default" { + provider = "google-beta" + region = "us-central1" + name = "<%= ctx[:vars]['region_health_check_name'] %>" - region = "us-central1" check_interval_sec = 1 timeout_sec = 1 http_health_check { diff --git a/third_party/terraform/tests/resource_compute_region_url_map_test.go.erb b/third_party/terraform/tests/resource_compute_region_url_map_test.go.erb index 7f4ee323f90a..3e33114ce4dc 100644 --- a/third_party/terraform/tests/resource_compute_region_url_map_test.go.erb +++ b/third_party/terraform/tests/resource_compute_region_url_map_test.go.erb @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) +<% unless version == 'ga' -%> func TestAccComputeRegionUrlMap_update_path_matcher(t *testing.T) { t.Parallel() @@ -357,3 +358,4 @@ resource "google_compute_region_url_map" "foobar" { } `, randomSuffix, randomSuffix, randomSuffix) } +<% end -%>