Remove tests for RegionUrlMap from GA provider (#2361)

Merged PR #2361.
GoogleCloudPlatform · Sep 23, 2019 · ac62b4b · ac62b4b
1 parent f0961ed
commit ac62b4b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git 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
@@ -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
@@ -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,26 +35,32 @@ 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
 
   health_checks = ["${google_compute_region_health_check.default.self_link}"]
 }
 
 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
 
   health_checks = ["${google_compute_region_health_check.default.self_link}"]
 }
 
 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
@@ -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 -%>