Fix test domain for Cloud Run Domain Mapping (#2899)

Merged PR #2899.
GoogleCloudPlatform · Dec 30, 2019 · ed947a9 · ed947a9
1 parent bb9bc9c
commit ed947a9
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/products/appengine/terraform.yaml b/products/appengine/terraform.yaml
@@ -78,8 +78,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       - !ruby/object:Provider::Terraform::Examples
         name: "app_engine_domain_mapping_basic"
         primary_resource_id: "domain_mapping"
-        vars:
-          domain: "dm-test-"
     custom_code:  !ruby/object:Provider::Terraform::CustomCode
       constants: templates/terraform/constants/domain_mapping.erb
     properties:

diff --git a/products/cloudrun/terraform.yaml b/products/cloudrun/terraform.yaml
@@ -22,8 +22,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         primary_resource_id: "default"
         vars:
           cloud_run_service_name: "tftest-cloudrun"
-        test_custom_context:
-          verified_domain: "\"tftest-domainmapping.com\""
         test_env_vars:
           namespace: :PROJECT_NAME
     custom_code: !ruby/object:Provider::Terraform::CustomCode

diff --git a/provider/terraform/examples.rb b/provider/terraform/examples.rb
@@ -182,12 +182,13 @@ def oics_link
         )
       end
 
+      # rubocop:disable Metrics/LineLength
       def substitute_test_paths(config)
         config.gsub!('../static/img/header-logo.png', 'test-fixtures/header-logo.png')
         config.gsub!('path/to/private.key', 'test-fixtures/ssl_cert/test.key')
         config.gsub!('path/to/certificate.crt', 'test-fixtures/ssl_cert/test.crt')
         config.gsub!('path/to/index.zip', '%{zip_path}')
-        config.gsub!('verified-domain.com', '%{verified_domain}')
+        config.gsub!('verified-domain.com', 'tf-test-domain%{random_suffix}.gcp.tfacc.hashicorptest.com')
         config
       end
 
@@ -197,6 +198,7 @@ def substitute_example_paths(config)
         config.gsub!('path/to/certificate.crt', '../static/ssl_cert/test.crt')
         config
       end
+      # rubocop:enable Metrics/LineLength
       # rubocop:enable Style/FormatStringToken
 
       def validate

diff --git a/templates/terraform/examples/app_engine_domain_mapping_basic.tf.erb b/templates/terraform/examples/app_engine_domain_mapping_basic.tf.erb
@@ -1,5 +1,5 @@
 resource "google_app_engine_domain_mapping" "<%= ctx[:primary_resource_id] %>" {
-  domain_name = "<%= ctx[:vars]["domain"] %>.gcp.tfacc.hashicorptest.com"
+  domain_name = "verified-domain.com"
 
   ssl_settings {
     ssl_management_type = "AUTOMATIC"