diff --git a/google/iam_pubsub_topic_generated_test.go b/google/iam_pubsub_topic_generated_test.go index 33e718df51f..b1074b74e80 100644 --- a/google/iam_pubsub_topic_generated_test.go +++ b/google/iam_pubsub_topic_generated_test.go @@ -114,7 +114,7 @@ func TestAccPubsubTopicIamPolicyGenerated(t *testing.T) { func testAccPubsubTopicIamMember_basicGenerated(context map[string]interface{}) string { return Nprintf(` resource "google_pubsub_topic" "example" { - name = "example-topic-%{random_suffix}" + name = "example-topic%{random_suffix}" labels = { foo = "bar" @@ -132,7 +132,7 @@ resource "google_pubsub_topic_iam_member" "foo" { func testAccPubsubTopicIamPolicy_basicGenerated(context map[string]interface{}) string { return Nprintf(` resource "google_pubsub_topic" "example" { - name = "example-topic-%{random_suffix}" + name = "example-topic%{random_suffix}" labels = { foo = "bar" @@ -156,7 +156,7 @@ resource "google_pubsub_topic_iam_policy" "foo" { func testAccPubsubTopicIamBinding_basicGenerated(context map[string]interface{}) string { return Nprintf(` resource "google_pubsub_topic" "example" { - name = "example-topic-%{random_suffix}" + name = "example-topic%{random_suffix}" labels = { foo = "bar" @@ -174,7 +174,7 @@ resource "google_pubsub_topic_iam_binding" "foo" { func testAccPubsubTopicIamBinding_updateGenerated(context map[string]interface{}) string { return Nprintf(` resource "google_pubsub_topic" "example" { - name = "example-topic-%{random_suffix}" + name = "example-topic%{random_suffix}" labels = { foo = "bar" diff --git a/google/iam_source_repo_repository_generated_test.go b/google/iam_source_repo_repository_generated_test.go index d94d78af64a..e7d8c5dfffc 100644 --- a/google/iam_source_repo_repository_generated_test.go +++ b/google/iam_source_repo_repository_generated_test.go @@ -114,7 +114,7 @@ func TestAccSourceRepoRepositoryIamPolicyGenerated(t *testing.T) { func testAccSourceRepoRepositoryIamMember_basicGenerated(context map[string]interface{}) string { return Nprintf(` resource "google_sourcerepo_repository" "my-repo" { - name = "my-repository-%{random_suffix}" + name = "my-repository%{random_suffix}" } resource "google_sourcerepo_repository_iam_member" "foo" { @@ -128,7 +128,7 @@ resource "google_sourcerepo_repository_iam_member" "foo" { func testAccSourceRepoRepositoryIamPolicy_basicGenerated(context map[string]interface{}) string { return Nprintf(` resource "google_sourcerepo_repository" "my-repo" { - name = "my-repository-%{random_suffix}" + name = "my-repository%{random_suffix}" } data "google_iam_policy" "foo" { @@ -148,7 +148,7 @@ resource "google_sourcerepo_repository_iam_policy" "foo" { func testAccSourceRepoRepositoryIamBinding_basicGenerated(context map[string]interface{}) string { return Nprintf(` resource "google_sourcerepo_repository" "my-repo" { - name = "my-repository-%{random_suffix}" + name = "my-repository%{random_suffix}" } resource "google_sourcerepo_repository_iam_binding" "foo" { @@ -162,7 +162,7 @@ resource "google_sourcerepo_repository_iam_binding" "foo" { func testAccSourceRepoRepositoryIamBinding_updateGenerated(context map[string]interface{}) string { return Nprintf(` resource "google_sourcerepo_repository" "my-repo" { - name = "my-repository-%{random_suffix}" + name = "my-repository%{random_suffix}" } resource "google_sourcerepo_repository_iam_binding" "foo" { diff --git a/google/resource_app_engine_firewall_rule_generated_test.go b/google/resource_app_engine_firewall_rule_generated_test.go index a8486dfa983..22a3875244a 100644 --- a/google/resource_app_engine_firewall_rule_generated_test.go +++ b/google/resource_app_engine_firewall_rule_generated_test.go @@ -53,7 +53,7 @@ func testAccAppEngineFirewallRule_appEngineFirewallRuleBasicExample(context map[ return Nprintf(` resource "google_project" "my_project" { name = "tf-test-project" - project_id = "test-project-%{random_suffix}" + project_id = "test-project%{random_suffix}" org_id = "%{org_id}" } diff --git a/google/resource_cloud_scheduler_job_generated_test.go b/google/resource_cloud_scheduler_job_generated_test.go index 41d41f4aa61..d8b27f2f4ed 100644 --- a/google/resource_cloud_scheduler_job_generated_test.go +++ b/google/resource_cloud_scheduler_job_generated_test.go @@ -52,11 +52,11 @@ func TestAccCloudSchedulerJob_schedulerJobPubsubExample(t *testing.T) { func testAccCloudSchedulerJob_schedulerJobPubsubExample(context map[string]interface{}) string { return Nprintf(` resource "google_pubsub_topic" "topic" { - name = "job-topic-%{random_suffix}" + name = "job-topic%{random_suffix}" } resource "google_cloud_scheduler_job" "job" { - name = "test-job-%{random_suffix}" + name = "test-job%{random_suffix}" description = "test job" schedule = "*/2 * * * *" @@ -96,7 +96,7 @@ func TestAccCloudSchedulerJob_schedulerJobHttpExample(t *testing.T) { func testAccCloudSchedulerJob_schedulerJobHttpExample(context map[string]interface{}) string { return Nprintf(` resource "google_cloud_scheduler_job" "job" { - name = "test-job-%{random_suffix}" + name = "test-job%{random_suffix}" description = "test http job" schedule = "*/8 * * * *" time_zone = "America/New_York" @@ -137,7 +137,7 @@ func TestAccCloudSchedulerJob_schedulerJobAppEngineExample(t *testing.T) { func testAccCloudSchedulerJob_schedulerJobAppEngineExample(context map[string]interface{}) string { return Nprintf(` resource "google_cloud_scheduler_job" "job" { - name = "test-job-%{random_suffix}" + name = "test-job%{random_suffix}" schedule = "*/4 * * * *" description = "test app engine job" time_zone = "Europe/London" diff --git a/google/resource_compute_address_generated_test.go b/google/resource_compute_address_generated_test.go index 041d0804b07..dd2fb9e9c22 100644 --- a/google/resource_compute_address_generated_test.go +++ b/google/resource_compute_address_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeAddress_addressBasicExample(t *testing.T) { func testAccComputeAddress_addressBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_address" "ip_address" { - name = "my-address-%{random_suffix}" + name = "my-address%{random_suffix}" } `, context) } @@ -83,18 +83,18 @@ func TestAccComputeAddress_addressWithSubnetworkExample(t *testing.T) { func testAccComputeAddress_addressWithSubnetworkExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_network" "default" { - name = "my-network-%{random_suffix}" + name = "my-network%{random_suffix}" } resource "google_compute_subnetwork" "default" { - name = "my-subnet-%{random_suffix}" + name = "my-subnet%{random_suffix}" ip_cidr_range = "10.0.0.0/16" region = "us-central1" network = "${google_compute_network.default.self_link}" } resource "google_compute_address" "internal_with_subnet_and_address" { - name = "my-internal-address-%{random_suffix}" + name = "my-internal-address%{random_suffix}" subnetwork = "${google_compute_subnetwork.default.self_link}" address_type = "INTERNAL" address = "10.0.42.42" @@ -130,7 +130,7 @@ func TestAccComputeAddress_instanceWithIpExample(t *testing.T) { func testAccComputeAddress_instanceWithIpExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_address" "static" { - name = "ipv4-address-%{random_suffix}" + name = "ipv4-address%{random_suffix}" } data "google_compute_image" "debian_image" { @@ -139,7 +139,7 @@ data "google_compute_image" "debian_image" { } resource "google_compute_instance" "instance_with_ip" { - name = "vm-instance-%{random_suffix}" + name = "vm-instance%{random_suffix}" machine_type = "f1-micro" zone = "us-central1-a" diff --git a/google/resource_compute_autoscaler_generated_test.go b/google/resource_compute_autoscaler_generated_test.go index 57f545070d3..8aef29b52ee 100644 --- a/google/resource_compute_autoscaler_generated_test.go +++ b/google/resource_compute_autoscaler_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeAutoscaler_autoscalerBasicExample(t *testing.T) { func testAccComputeAutoscaler_autoscalerBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_autoscaler" "foobar" { - name = "my-autoscaler-%{random_suffix}" + name = "my-autoscaler%{random_suffix}" zone = "us-central1-f" target = "${google_compute_instance_group_manager.foobar.self_link}" @@ -67,7 +67,7 @@ resource "google_compute_autoscaler" "foobar" { } resource "google_compute_instance_template" "foobar" { - name = "my-instance-template-%{random_suffix}" + name = "my-instance-template%{random_suffix}" machine_type = "n1-standard-1" can_ip_forward = false @@ -91,11 +91,11 @@ resource "google_compute_instance_template" "foobar" { } resource "google_compute_target_pool" "foobar" { - name = "my-target-pool-%{random_suffix}" + name = "my-target-pool%{random_suffix}" } resource "google_compute_instance_group_manager" "foobar" { - name = "my-igm-%{random_suffix}" + name = "my-igm%{random_suffix}" zone = "us-central1-f" instance_template = "${google_compute_instance_template.foobar.self_link}" diff --git a/google/resource_compute_backend_bucket_generated_test.go b/google/resource_compute_backend_bucket_generated_test.go index b72c054aa19..4019fd1e822 100644 --- a/google/resource_compute_backend_bucket_generated_test.go +++ b/google/resource_compute_backend_bucket_generated_test.go @@ -51,14 +51,14 @@ func TestAccComputeBackendBucket_backendBucketBasicExample(t *testing.T) { func testAccComputeBackendBucket_backendBucketBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_backend_bucket" "image_backend" { - name = "image-backend-bucket-%{random_suffix}" + name = "image-backend-bucket%{random_suffix}" description = "Contains beautiful images" bucket_name = "${google_storage_bucket.image_bucket.name}" enable_cdn = true } resource "google_storage_bucket" "image_bucket" { - name = "image-store-bucket-%{random_suffix}" + name = "image-store-bucket%{random_suffix}" location = "EU" } `, context) diff --git a/google/resource_compute_backend_service_generated_test.go b/google/resource_compute_backend_service_generated_test.go index ee9a53d91be..b4a79a1ef53 100644 --- a/google/resource_compute_backend_service_generated_test.go +++ b/google/resource_compute_backend_service_generated_test.go @@ -51,12 +51,12 @@ func TestAccComputeBackendService_backendServiceBasicExample(t *testing.T) { func testAccComputeBackendService_backendServiceBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_backend_service" "default" { - name = "backend-service-%{random_suffix}" + name = "backend-service%{random_suffix}" health_checks = ["${google_compute_http_health_check.default.self_link}"] } resource "google_compute_http_health_check" "default" { - name = "health-check-%{random_suffix}" + name = "health-check%{random_suffix}" request_path = "/" check_interval_sec = 1 timeout_sec = 1 diff --git a/google/resource_compute_disk_generated_test.go b/google/resource_compute_disk_generated_test.go index feb8f292e6f..3f05d3ebe94 100644 --- a/google/resource_compute_disk_generated_test.go +++ b/google/resource_compute_disk_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeDisk_diskBasicExample(t *testing.T) { func testAccComputeDisk_diskBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_disk" "default" { - name = "test-disk-%{random_suffix}" + name = "test-disk%{random_suffix}" type = "pd-ssd" zone = "us-central1-a" image = "debian-8-jessie-v20170523" diff --git a/google/resource_compute_firewall_generated_test.go b/google/resource_compute_firewall_generated_test.go index 3042ed3db6d..9140244f30b 100644 --- a/google/resource_compute_firewall_generated_test.go +++ b/google/resource_compute_firewall_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeFirewall_firewallBasicExample(t *testing.T) { func testAccComputeFirewall_firewallBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_firewall" "default" { - name = "test-firewall-%{random_suffix}" + name = "test-firewall%{random_suffix}" network = "${google_compute_network.default.name}" allow { @@ -67,7 +67,7 @@ resource "google_compute_firewall" "default" { } resource "google_compute_network" "default" { - name = "test-network-%{random_suffix}" + name = "test-network%{random_suffix}" } `, context) } diff --git a/google/resource_compute_forwarding_rule_generated_test.go b/google/resource_compute_forwarding_rule_generated_test.go index 8b88c8e90f6..cc9b5af5461 100644 --- a/google/resource_compute_forwarding_rule_generated_test.go +++ b/google/resource_compute_forwarding_rule_generated_test.go @@ -51,13 +51,13 @@ func TestAccComputeForwardingRule_forwardingRuleBasicExample(t *testing.T) { func testAccComputeForwardingRule_forwardingRuleBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_forwarding_rule" "default" { - name = "website-forwarding-rule-%{random_suffix}" + name = "website-forwarding-rule%{random_suffix}" target = "${google_compute_target_pool.default.self_link}" port_range = "80" } resource "google_compute_target_pool" "default" { - name = "website-target-pool-%{random_suffix}" + name = "website-target-pool%{random_suffix}" } `, context) } @@ -90,7 +90,7 @@ func testAccComputeForwardingRule_forwardingRuleInternallbExample(context map[st return Nprintf(` // Forwarding rule for Internal Load Balancing resource "google_compute_forwarding_rule" "default" { - name = "website-forwarding-rule-%{random_suffix}" + name = "website-forwarding-rule%{random_suffix}" region = "us-central1" load_balancing_scheme = "INTERNAL" @@ -101,13 +101,13 @@ resource "google_compute_forwarding_rule" "default" { } resource "google_compute_region_backend_service" "backend" { - name = "website-backend-%{random_suffix}" + name = "website-backend%{random_suffix}" region = "us-central1" health_checks = ["${google_compute_health_check.hc.self_link}"] } resource "google_compute_health_check" "hc" { - name = "check-website-backend-%{random_suffix}" + name = "check-website-backend%{random_suffix}" check_interval_sec = 1 timeout_sec = 1 @@ -117,12 +117,12 @@ resource "google_compute_health_check" "hc" { } resource "google_compute_network" "default" { - name = "website-net-%{random_suffix}" + name = "website-net%{random_suffix}" auto_create_subnetworks = false } resource "google_compute_subnetwork" "default" { - name = "website-net-%{random_suffix}" + name = "website-net%{random_suffix}" ip_cidr_range = "10.0.0.0/16" region = "us-central1" network = "${google_compute_network.default.self_link}" diff --git a/google/resource_compute_global_address_generated_test.go b/google/resource_compute_global_address_generated_test.go index 501642f1241..1d51d126ded 100644 --- a/google/resource_compute_global_address_generated_test.go +++ b/google/resource_compute_global_address_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeGlobalAddress_globalAddressBasicExample(t *testing.T) { func testAccComputeGlobalAddress_globalAddressBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_global_address" "default" { - name = "global-appserver-ip-%{random_suffix}" + name = "global-appserver-ip%{random_suffix}" } `, context) } diff --git a/google/resource_compute_global_forwarding_rule_generated_test.go b/google/resource_compute_global_forwarding_rule_generated_test.go index 9fc60e5afb9..f62d4223413 100644 --- a/google/resource_compute_global_forwarding_rule_generated_test.go +++ b/google/resource_compute_global_forwarding_rule_generated_test.go @@ -51,19 +51,19 @@ func TestAccComputeGlobalForwardingRule_globalForwardingRuleHttpExample(t *testi func testAccComputeGlobalForwardingRule_globalForwardingRuleHttpExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_global_forwarding_rule" "default" { - name = "global-rule-%{random_suffix}" + name = "global-rule%{random_suffix}" target = "${google_compute_target_http_proxy.default.self_link}" port_range = "80" } resource "google_compute_target_http_proxy" "default" { - name = "target-proxy-%{random_suffix}" + name = "target-proxy%{random_suffix}" description = "a description" url_map = "${google_compute_url_map.default.self_link}" } resource "google_compute_url_map" "default" { - name = "url-map-target-proxy-%{random_suffix}" + name = "url-map-target-proxy%{random_suffix}" description = "a description" default_service = "${google_compute_backend_service.default.self_link}" @@ -84,7 +84,7 @@ resource "google_compute_url_map" "default" { } resource "google_compute_backend_service" "default" { - name = "backend-%{random_suffix}" + name = "backend%{random_suffix}" port_name = "http" protocol = "HTTP" timeout_sec = 10 @@ -93,7 +93,7 @@ resource "google_compute_backend_service" "default" { } resource "google_compute_http_health_check" "default" { - name = "check-backend-%{random_suffix}" + name = "check-backend%{random_suffix}" request_path = "/" check_interval_sec = 1 timeout_sec = 1 diff --git a/google/resource_compute_health_check_generated_test.go b/google/resource_compute_health_check_generated_test.go index 155c3b6817c..e51eef5d035 100644 --- a/google/resource_compute_health_check_generated_test.go +++ b/google/resource_compute_health_check_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeHealthCheck_healthCheckBasicExample(t *testing.T) { func testAccComputeHealthCheck_healthCheckBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_health_check" "internal-health-check" { - name = "internal-service-health-check-%{random_suffix}" + name = "internal-service-health-check%{random_suffix}" timeout_sec = 1 check_interval_sec = 1 diff --git a/google/resource_compute_http_health_check_generated_test.go b/google/resource_compute_http_health_check_generated_test.go index 8d6b91a9b2e..5bab7f1fd6a 100644 --- a/google/resource_compute_http_health_check_generated_test.go +++ b/google/resource_compute_http_health_check_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeHttpHealthCheck_httpHealthCheckBasicExample(t *testing.T) { func testAccComputeHttpHealthCheck_httpHealthCheckBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_http_health_check" "default" { - name = "authentication-health-check-%{random_suffix}" + name = "authentication-health-check%{random_suffix}" request_path = "/health_check" timeout_sec = 1 diff --git a/google/resource_compute_https_health_check_generated_test.go b/google/resource_compute_https_health_check_generated_test.go index 5cb5970801d..ab5924954b8 100644 --- a/google/resource_compute_https_health_check_generated_test.go +++ b/google/resource_compute_https_health_check_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeHttpsHealthCheck_httpsHealthCheckBasicExample(t *testing.T) { func testAccComputeHttpsHealthCheck_httpsHealthCheckBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_https_health_check" "default" { - name = "authentication-health-check-%{random_suffix}" + name = "authentication-health-check%{random_suffix}" request_path = "/health_check" timeout_sec = 1 diff --git a/google/resource_compute_image_generated_test.go b/google/resource_compute_image_generated_test.go index f5c2bfb8404..e345b0d19c9 100644 --- a/google/resource_compute_image_generated_test.go +++ b/google/resource_compute_image_generated_test.go @@ -52,7 +52,7 @@ func TestAccComputeImage_imageBasicExample(t *testing.T) { func testAccComputeImage_imageBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_image" "example" { - name = "example-image-%{random_suffix}" + name = "example-image%{random_suffix}" raw_disk { source = "https://storage.googleapis.com/bosh-cpi-artifacts/bosh-stemcell-3262.4-google-kvm-ubuntu-trusty-go_agent-raw.tar.gz" diff --git a/google/resource_compute_network_endpoint_group_generated_test.go b/google/resource_compute_network_endpoint_group_generated_test.go index 2634e1c999f..97256c2524b 100644 --- a/google/resource_compute_network_endpoint_group_generated_test.go +++ b/google/resource_compute_network_endpoint_group_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeNetworkEndpointGroup_networkEndpointGroupExample(t *testing.T func testAccComputeNetworkEndpointGroup_networkEndpointGroupExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_network_endpoint_group" "neg" { - name = "my-lb-neg-%{random_suffix}" + name = "my-lb-neg%{random_suffix}" network = "${google_compute_network.default.self_link}" subnetwork = "${google_compute_subnetwork.default.self_link}" default_port = "90" @@ -59,12 +59,12 @@ resource "google_compute_network_endpoint_group" "neg" { } resource "google_compute_network" "default" { - name = "neg-network-%{random_suffix}" + name = "neg-network%{random_suffix}" auto_create_subnetworks = false } resource "google_compute_subnetwork" "default" { - name = "neg-subnetwork-%{random_suffix}" + name = "neg-subnetwork%{random_suffix}" ip_cidr_range = "10.0.0.0/16" region = "us-central1" network = "${google_compute_network.default.self_link}" diff --git a/google/resource_compute_network_generated_test.go b/google/resource_compute_network_generated_test.go index 05a9469fab2..0355cb61bb7 100644 --- a/google/resource_compute_network_generated_test.go +++ b/google/resource_compute_network_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeNetwork_networkBasicExample(t *testing.T) { func testAccComputeNetwork_networkBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_network" "vpc_network" { - name = "vpc-network-%{random_suffix}" + name = "vpc-network%{random_suffix}" } `, context) } diff --git a/google/resource_compute_node_group_generated_test.go b/google/resource_compute_node_group_generated_test.go index 1ed2c80c274..e29df97f39d 100644 --- a/google/resource_compute_node_group_generated_test.go +++ b/google/resource_compute_node_group_generated_test.go @@ -55,13 +55,13 @@ data "google_compute_node_types" "central1a" { } resource "google_compute_node_template" "soletenant-tmpl" { - name = "soletenant-tmpl-%{random_suffix}" + name = "soletenant-tmpl%{random_suffix}" region = "us-central1" node_type = "${data.google_compute_node_types.central1a.names[0]}" } resource "google_compute_node_group" "nodes" { - name = "soletenant-group-%{random_suffix}" + name = "soletenant-group%{random_suffix}" zone = "us-central1-a" description = "example google_compute_node_group for Terraform Google Provider" diff --git a/google/resource_compute_node_template_generated_test.go b/google/resource_compute_node_template_generated_test.go index 9d7d8e950f7..107f899087a 100644 --- a/google/resource_compute_node_template_generated_test.go +++ b/google/resource_compute_node_template_generated_test.go @@ -55,7 +55,7 @@ data "google_compute_node_types" "central1a" { } resource "google_compute_node_template" "template" { - name = "soletenant-tmpl-%{random_suffix}" + name = "soletenant-tmpl%{random_suffix}" region = "us-central1" node_type = "${data.google_compute_node_types.central1a.names[0]}" } diff --git a/google/resource_compute_region_autoscaler_generated_test.go b/google/resource_compute_region_autoscaler_generated_test.go index 8a557b6546f..23786fd221c 100644 --- a/google/resource_compute_region_autoscaler_generated_test.go +++ b/google/resource_compute_region_autoscaler_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeRegionAutoscaler_regionAutoscalerBasicExample(t *testing.T) { func testAccComputeRegionAutoscaler_regionAutoscalerBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_region_autoscaler" "foobar" { - name = "my-region-autoscaler-%{random_suffix}" + name = "my-region-autoscaler%{random_suffix}" region = "us-central1" target = "${google_compute_region_instance_group_manager.foobar.self_link}" @@ -67,7 +67,7 @@ resource "google_compute_region_autoscaler" "foobar" { } resource "google_compute_instance_template" "foobar" { - name = "my-instance-template-%{random_suffix}" + name = "my-instance-template%{random_suffix}" machine_type = "n1-standard-1" can_ip_forward = false @@ -91,11 +91,11 @@ resource "google_compute_instance_template" "foobar" { } resource "google_compute_target_pool" "foobar" { - name = "my-target-pool-%{random_suffix}" + name = "my-target-pool%{random_suffix}" } resource "google_compute_region_instance_group_manager" "foobar" { - name = "my-region-igm-%{random_suffix}" + name = "my-region-igm%{random_suffix}" region = "us-central1" instance_template = "${google_compute_instance_template.foobar.self_link}" diff --git a/google/resource_compute_region_backend_service_generated_test.go b/google/resource_compute_region_backend_service_generated_test.go index 21a43e51a80..2da9e7dd572 100644 --- a/google/resource_compute_region_backend_service_generated_test.go +++ b/google/resource_compute_region_backend_service_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeRegionBackendService_regionBackendServiceBasicExample(t *test func testAccComputeRegionBackendService_regionBackendServiceBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_region_backend_service" "default" { - name = "region-backend-service-%{random_suffix}" + name = "region-backend-service%{random_suffix}" region = "us-central1" health_checks = ["${google_compute_health_check.default.self_link}"] connection_draining_timeout_sec = 10 @@ -59,7 +59,7 @@ resource "google_compute_region_backend_service" "default" { } resource "google_compute_health_check" "default" { - name = "health-check-%{random_suffix}" + name = "health-check%{random_suffix}" check_interval_sec = 1 timeout_sec = 1 diff --git a/google/resource_compute_region_disk_generated_test.go b/google/resource_compute_region_disk_generated_test.go index ac1b37df31e..6cd7e72c6f6 100644 --- a/google/resource_compute_region_disk_generated_test.go +++ b/google/resource_compute_region_disk_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeRegionDisk_regionDiskBasicExample(t *testing.T) { func testAccComputeRegionDisk_regionDiskBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_region_disk" "regiondisk" { - name = "my-region-disk-%{random_suffix}" + name = "my-region-disk%{random_suffix}" snapshot = "${google_compute_snapshot.snapdisk.self_link}" type = "pd-ssd" region = "us-central1" @@ -61,7 +61,7 @@ resource "google_compute_region_disk" "regiondisk" { } resource "google_compute_disk" "disk" { - name = "my-disk-%{random_suffix}" + name = "my-disk%{random_suffix}" image = "debian-cloud/debian-9" size = 50 type = "pd-ssd" @@ -69,7 +69,7 @@ resource "google_compute_disk" "disk" { } resource "google_compute_snapshot" "snapdisk" { - name = "my-snapshot-%{random_suffix}" + name = "my-snapshot%{random_suffix}" source_disk = "${google_compute_disk.disk.name}" zone = "us-central1-a" } diff --git a/google/resource_compute_route_generated_test.go b/google/resource_compute_route_generated_test.go index c5bc6f0a682..99e6a98bd4c 100644 --- a/google/resource_compute_route_generated_test.go +++ b/google/resource_compute_route_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeRoute_routeBasicExample(t *testing.T) { func testAccComputeRoute_routeBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_route" "default" { - name = "network-route-%{random_suffix}" + name = "network-route%{random_suffix}" dest_range = "15.0.0.0/24" network = "${google_compute_network.default.name}" next_hop_ip = "10.132.1.5" @@ -59,7 +59,7 @@ resource "google_compute_route" "default" { } resource "google_compute_network" "default" { - name = "compute-network-%{random_suffix}" + name = "compute-network%{random_suffix}" } `, context) } diff --git a/google/resource_compute_router_generated_test.go b/google/resource_compute_router_generated_test.go index c139c62e8e3..6c42b31c841 100644 --- a/google/resource_compute_router_generated_test.go +++ b/google/resource_compute_router_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeRouter_routerBasicExample(t *testing.T) { func testAccComputeRouter_routerBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_router" "foobar" { - name = "my-router-%{random_suffix}" + name = "my-router%{random_suffix}" network = "${google_compute_network.foobar.name}" bgp { asn = 64514 @@ -67,7 +67,7 @@ resource "google_compute_router" "foobar" { } resource "google_compute_network" "foobar" { - name = "my-network-%{random_suffix}" + name = "my-network%{random_suffix}" auto_create_subnetworks = false } `, context) diff --git a/google/resource_compute_snapshot_generated_test.go b/google/resource_compute_snapshot_generated_test.go index 2d66a103879..eb1a152dd5f 100644 --- a/google/resource_compute_snapshot_generated_test.go +++ b/google/resource_compute_snapshot_generated_test.go @@ -52,7 +52,7 @@ func TestAccComputeSnapshot_snapshotBasicExample(t *testing.T) { func testAccComputeSnapshot_snapshotBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_snapshot" "snapshot" { - name = "my-snapshot-%{random_suffix}" + name = "my-snapshot%{random_suffix}" source_disk = "${google_compute_disk.persistent.name}" zone = "us-central1-a" labels = { @@ -66,7 +66,7 @@ data "google_compute_image" "debian" { } resource "google_compute_disk" "persistent" { - name = "debian-disk-%{random_suffix}" + name = "debian-disk%{random_suffix}" image = "${data.google_compute_image.debian.self_link}" size = 10 type = "pd-ssd" diff --git a/google/resource_compute_ssl_certificate_generated_test.go b/google/resource_compute_ssl_certificate_generated_test.go index c17833203d1..f2e71215afe 100644 --- a/google/resource_compute_ssl_certificate_generated_test.go +++ b/google/resource_compute_ssl_certificate_generated_test.go @@ -165,13 +165,13 @@ resource "google_compute_ssl_certificate" "default" { } resource "google_compute_target_https_proxy" "default" { - name = "test-proxy-%{random_suffix}" + name = "test-proxy%{random_suffix}" url_map = "${google_compute_url_map.default.self_link}" ssl_certificates = ["${google_compute_ssl_certificate.default.self_link}"] } resource "google_compute_url_map" "default" { - name = "url-map-%{random_suffix}" + name = "url-map%{random_suffix}" description = "a description" default_service = "${google_compute_backend_service.default.self_link}" @@ -193,7 +193,7 @@ resource "google_compute_url_map" "default" { } resource "google_compute_backend_service" "default" { - name = "backend-service-%{random_suffix}" + name = "backend-service%{random_suffix}" port_name = "http" protocol = "HTTP" timeout_sec = 10 @@ -202,7 +202,7 @@ resource "google_compute_backend_service" "default" { } resource "google_compute_http_health_check" "default" { - name = "http-health-check-%{random_suffix}" + name = "http-health-check%{random_suffix}" request_path = "/" check_interval_sec = 1 timeout_sec = 1 diff --git a/google/resource_compute_ssl_policy_generated_test.go b/google/resource_compute_ssl_policy_generated_test.go index e3076f77129..9fbd0d094ef 100644 --- a/google/resource_compute_ssl_policy_generated_test.go +++ b/google/resource_compute_ssl_policy_generated_test.go @@ -51,18 +51,18 @@ func TestAccComputeSslPolicy_sslPolicyBasicExample(t *testing.T) { func testAccComputeSslPolicy_sslPolicyBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_ssl_policy" "prod-ssl-policy" { - name = "production-ssl-policy-%{random_suffix}" + name = "production-ssl-policy%{random_suffix}" profile = "MODERN" } resource "google_compute_ssl_policy" "nonprod-ssl-policy" { - name = "nonprod-ssl-policy-%{random_suffix}" + name = "nonprod-ssl-policy%{random_suffix}" profile = "MODERN" min_tls_version = "TLS_1_2" } resource "google_compute_ssl_policy" "custom-ssl-policy" { - name = "custom-ssl-policy-%{random_suffix}" + name = "custom-ssl-policy%{random_suffix}" min_tls_version = "TLS_1_2" profile = "CUSTOM" custom_features = ["TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"] diff --git a/google/resource_compute_subnetwork_generated_test.go b/google/resource_compute_subnetwork_generated_test.go index 742c89f8781..01c5f7a88de 100644 --- a/google/resource_compute_subnetwork_generated_test.go +++ b/google/resource_compute_subnetwork_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeSubnetwork_subnetworkBasicExample(t *testing.T) { func testAccComputeSubnetwork_subnetworkBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges" { - name = "test-subnetwork-%{random_suffix}" + name = "test-subnetwork%{random_suffix}" ip_cidr_range = "10.2.0.0/16" region = "us-central1" network = "${google_compute_network.custom-test.self_link}" @@ -62,7 +62,7 @@ resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges" } resource "google_compute_network" "custom-test" { - name = "test-network-%{random_suffix}" + name = "test-network%{random_suffix}" auto_create_subnetworks = false } `, context) diff --git a/google/resource_compute_target_http_proxy_generated_test.go b/google/resource_compute_target_http_proxy_generated_test.go index a9f688587bb..a5690b32c64 100644 --- a/google/resource_compute_target_http_proxy_generated_test.go +++ b/google/resource_compute_target_http_proxy_generated_test.go @@ -51,12 +51,12 @@ func TestAccComputeTargetHttpProxy_targetHttpProxyBasicExample(t *testing.T) { func testAccComputeTargetHttpProxy_targetHttpProxyBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_target_http_proxy" "default" { - name = "test-proxy-%{random_suffix}" + name = "test-proxy%{random_suffix}" url_map = "${google_compute_url_map.default.self_link}" } resource "google_compute_url_map" "default" { - name = "url-map-%{random_suffix}" + name = "url-map%{random_suffix}" default_service = "${google_compute_backend_service.default.self_link}" host_rule { @@ -76,7 +76,7 @@ resource "google_compute_url_map" "default" { } resource "google_compute_backend_service" "default" { - name = "backend-service-%{random_suffix}" + name = "backend-service%{random_suffix}" port_name = "http" protocol = "HTTP" timeout_sec = 10 @@ -85,7 +85,7 @@ resource "google_compute_backend_service" "default" { } resource "google_compute_http_health_check" "default" { - name = "http-health-check-%{random_suffix}" + name = "http-health-check%{random_suffix}" request_path = "/" check_interval_sec = 1 timeout_sec = 1 diff --git a/google/resource_compute_target_https_proxy_generated_test.go b/google/resource_compute_target_https_proxy_generated_test.go index 3e73162cb8a..17aaa1ca8b5 100644 --- a/google/resource_compute_target_https_proxy_generated_test.go +++ b/google/resource_compute_target_https_proxy_generated_test.go @@ -51,19 +51,19 @@ func TestAccComputeTargetHttpsProxy_targetHttpsProxyBasicExample(t *testing.T) { func testAccComputeTargetHttpsProxy_targetHttpsProxyBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_target_https_proxy" "default" { - name = "test-proxy-%{random_suffix}" + name = "test-proxy%{random_suffix}" url_map = "${google_compute_url_map.default.self_link}" ssl_certificates = ["${google_compute_ssl_certificate.default.self_link}"] } resource "google_compute_ssl_certificate" "default" { - name = "my-certificate-%{random_suffix}" + name = "my-certificate%{random_suffix}" private_key = "${file("test-fixtures/ssl_cert/test.key")}" certificate = "${file("test-fixtures/ssl_cert/test.crt")}" } resource "google_compute_url_map" "default" { - name = "url-map-%{random_suffix}" + name = "url-map%{random_suffix}" description = "a description" default_service = "${google_compute_backend_service.default.self_link}" @@ -85,7 +85,7 @@ resource "google_compute_url_map" "default" { } resource "google_compute_backend_service" "default" { - name = "backend-service-%{random_suffix}" + name = "backend-service%{random_suffix}" port_name = "http" protocol = "HTTP" timeout_sec = 10 @@ -94,7 +94,7 @@ resource "google_compute_backend_service" "default" { } resource "google_compute_http_health_check" "default" { - name = "http-health-check-%{random_suffix}" + name = "http-health-check%{random_suffix}" request_path = "/" check_interval_sec = 1 timeout_sec = 1 diff --git a/google/resource_compute_target_instance_generated_test.go b/google/resource_compute_target_instance_generated_test.go index b0f924ecc7c..1f5ef39da86 100644 --- a/google/resource_compute_target_instance_generated_test.go +++ b/google/resource_compute_target_instance_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeTargetInstance_targetInstanceBasicExample(t *testing.T) { func testAccComputeTargetInstance_targetInstanceBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_target_instance" "default" { - name = "target-%{random_suffix}" + name = "target%{random_suffix}" instance = "${google_compute_instance.target-vm.self_link}" } @@ -61,7 +61,7 @@ data "google_compute_image" "vmimage" { } resource "google_compute_instance" "target-vm" { - name = "target-vm-%{random_suffix}" + name = "target-vm%{random_suffix}" machine_type = "n1-standard-1" zone = "us-central1-a" diff --git a/google/resource_compute_target_ssl_proxy_generated_test.go b/google/resource_compute_target_ssl_proxy_generated_test.go index c30defeb154..aae6ed94236 100644 --- a/google/resource_compute_target_ssl_proxy_generated_test.go +++ b/google/resource_compute_target_ssl_proxy_generated_test.go @@ -51,25 +51,25 @@ func TestAccComputeTargetSslProxy_targetSslProxyBasicExample(t *testing.T) { func testAccComputeTargetSslProxy_targetSslProxyBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_target_ssl_proxy" "default" { - name = "test-proxy-%{random_suffix}" + name = "test-proxy%{random_suffix}" backend_service = "${google_compute_backend_service.default.self_link}" ssl_certificates = ["${google_compute_ssl_certificate.default.self_link}"] } resource "google_compute_ssl_certificate" "default" { - name = "default-cert-%{random_suffix}" + name = "default-cert%{random_suffix}" private_key = "${file("test-fixtures/ssl_cert/test.key")}" certificate = "${file("test-fixtures/ssl_cert/test.crt")}" } resource "google_compute_backend_service" "default" { - name = "backend-service-%{random_suffix}" + name = "backend-service%{random_suffix}" protocol = "SSL" health_checks = ["${google_compute_health_check.default.self_link}"] } resource "google_compute_health_check" "default" { - name = "health-check-%{random_suffix}" + name = "health-check%{random_suffix}" check_interval_sec = 1 timeout_sec = 1 tcp_health_check { diff --git a/google/resource_compute_target_tcp_proxy_generated_test.go b/google/resource_compute_target_tcp_proxy_generated_test.go index 2c2396c2d31..198b652e514 100644 --- a/google/resource_compute_target_tcp_proxy_generated_test.go +++ b/google/resource_compute_target_tcp_proxy_generated_test.go @@ -51,12 +51,12 @@ func TestAccComputeTargetTcpProxy_targetTcpProxyBasicExample(t *testing.T) { func testAccComputeTargetTcpProxy_targetTcpProxyBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_target_tcp_proxy" "default" { - name = "test-proxy-%{random_suffix}" + name = "test-proxy%{random_suffix}" backend_service = "${google_compute_backend_service.default.self_link}" } resource "google_compute_backend_service" "default" { - name = "backend-service-%{random_suffix}" + name = "backend-service%{random_suffix}" protocol = "TCP" timeout_sec = 10 @@ -64,7 +64,7 @@ resource "google_compute_backend_service" "default" { } resource "google_compute_health_check" "default" { - name = "health-check-%{random_suffix}" + name = "health-check%{random_suffix}" timeout_sec = 1 check_interval_sec = 1 diff --git a/google/resource_compute_url_map_generated_test.go b/google/resource_compute_url_map_generated_test.go index 1facb654681..b5290e423bf 100644 --- a/google/resource_compute_url_map_generated_test.go +++ b/google/resource_compute_url_map_generated_test.go @@ -51,7 +51,7 @@ func TestAccComputeUrlMap_urlMapBasicExample(t *testing.T) { func testAccComputeUrlMap_urlMapBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_url_map" "urlmap" { - name = "urlmap-%{random_suffix}" + name = "urlmap%{random_suffix}" description = "a description" default_service = "${google_compute_backend_service.home.self_link}" @@ -89,7 +89,7 @@ resource "google_compute_url_map" "urlmap" { } resource "google_compute_backend_service" "login" { - name = "login-%{random_suffix}" + name = "login%{random_suffix}" port_name = "http" protocol = "HTTP" timeout_sec = 10 @@ -98,7 +98,7 @@ resource "google_compute_backend_service" "login" { } resource "google_compute_backend_service" "home" { - name = "home-%{random_suffix}" + name = "home%{random_suffix}" port_name = "http" protocol = "HTTP" timeout_sec = 10 @@ -107,20 +107,20 @@ resource "google_compute_backend_service" "home" { } resource "google_compute_http_health_check" "default" { - name = "health-check-%{random_suffix}" + name = "health-check%{random_suffix}" request_path = "/" check_interval_sec = 1 timeout_sec = 1 } resource "google_compute_backend_bucket" "static" { - name = "static-asset-backend-bucket-%{random_suffix}" + name = "static-asset-backend-bucket%{random_suffix}" bucket_name = "${google_storage_bucket.static.name}" enable_cdn = true } resource "google_storage_bucket" "static" { - name = "static-asset-bucket-%{random_suffix}" + name = "static-asset-bucket%{random_suffix}" location = "US" } `, context) diff --git a/google/resource_compute_vpn_gateway_generated_test.go b/google/resource_compute_vpn_gateway_generated_test.go index 7141e4e8c5c..1d2f3165bab 100644 --- a/google/resource_compute_vpn_gateway_generated_test.go +++ b/google/resource_compute_vpn_gateway_generated_test.go @@ -51,27 +51,27 @@ func TestAccComputeVpnGateway_targetVpnGatewayBasicExample(t *testing.T) { func testAccComputeVpnGateway_targetVpnGatewayBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_vpn_gateway" "target_gateway" { - name = "vpn1-%{random_suffix}" + name = "vpn1%{random_suffix}" network = "${google_compute_network.network1.self_link}" } resource "google_compute_network" "network1" { - name = "network1-%{random_suffix}" + name = "network1%{random_suffix}" } resource "google_compute_address" "vpn_static_ip" { - name = "vpn-static-ip-%{random_suffix}" + name = "vpn-static-ip%{random_suffix}" } resource "google_compute_forwarding_rule" "fr_esp" { - name = "fr-esp-%{random_suffix}" + name = "fr-esp%{random_suffix}" ip_protocol = "ESP" ip_address = "${google_compute_address.vpn_static_ip.address}" target = "${google_compute_vpn_gateway.target_gateway.self_link}" } resource "google_compute_forwarding_rule" "fr_udp500" { - name = "fr-udp500-%{random_suffix}" + name = "fr-udp500%{random_suffix}" ip_protocol = "UDP" port_range = "500" ip_address = "${google_compute_address.vpn_static_ip.address}" @@ -79,7 +79,7 @@ resource "google_compute_forwarding_rule" "fr_udp500" { } resource "google_compute_forwarding_rule" "fr_udp4500" { - name = "fr-udp4500-%{random_suffix}" + name = "fr-udp4500%{random_suffix}" ip_protocol = "UDP" port_range = "4500" ip_address = "${google_compute_address.vpn_static_ip.address}" @@ -87,7 +87,7 @@ resource "google_compute_forwarding_rule" "fr_udp4500" { } resource "google_compute_vpn_tunnel" "tunnel1" { - name = "tunnel1-%{random_suffix}" + name = "tunnel1%{random_suffix}" peer_ip = "15.0.0.120" shared_secret = "a secret message" @@ -101,7 +101,7 @@ resource "google_compute_vpn_tunnel" "tunnel1" { } resource "google_compute_route" "route1" { - name = "route1-%{random_suffix}" + name = "route1%{random_suffix}" network = "${google_compute_network.network1.name}" dest_range = "15.0.0.0/24" priority = 1000 diff --git a/google/resource_compute_vpn_tunnel_generated_test.go b/google/resource_compute_vpn_tunnel_generated_test.go index d865e5a4517..d6e2b2a331d 100644 --- a/google/resource_compute_vpn_tunnel_generated_test.go +++ b/google/resource_compute_vpn_tunnel_generated_test.go @@ -52,7 +52,7 @@ func TestAccComputeVpnTunnel_vpnTunnelBasicExample(t *testing.T) { func testAccComputeVpnTunnel_vpnTunnelBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_compute_vpn_tunnel" "tunnel1" { - name = "tunnel1-%{random_suffix}" + name = "tunnel1%{random_suffix}" peer_ip = "15.0.0.120" shared_secret = "a secret message" @@ -66,27 +66,27 @@ resource "google_compute_vpn_tunnel" "tunnel1" { } resource "google_compute_vpn_gateway" "target_gateway" { - name = "vpn1-%{random_suffix}" + name = "vpn1%{random_suffix}" network = "${google_compute_network.network1.self_link}" } resource "google_compute_network" "network1" { - name = "network1-%{random_suffix}" + name = "network1%{random_suffix}" } resource "google_compute_address" "vpn_static_ip" { - name = "vpn-static-ip-%{random_suffix}" + name = "vpn-static-ip%{random_suffix}" } resource "google_compute_forwarding_rule" "fr_esp" { - name = "fr-esp-%{random_suffix}" + name = "fr-esp%{random_suffix}" ip_protocol = "ESP" ip_address = "${google_compute_address.vpn_static_ip.address}" target = "${google_compute_vpn_gateway.target_gateway.self_link}" } resource "google_compute_forwarding_rule" "fr_udp500" { - name = "fr-udp500-%{random_suffix}" + name = "fr-udp500%{random_suffix}" ip_protocol = "UDP" port_range = "500" ip_address = "${google_compute_address.vpn_static_ip.address}" @@ -94,7 +94,7 @@ resource "google_compute_forwarding_rule" "fr_udp500" { } resource "google_compute_forwarding_rule" "fr_udp4500" { - name = "fr-udp4500-%{random_suffix}" + name = "fr-udp4500%{random_suffix}" ip_protocol = "UDP" port_range = "4500" ip_address = "${google_compute_address.vpn_static_ip.address}" @@ -102,7 +102,7 @@ resource "google_compute_forwarding_rule" "fr_udp4500" { } resource "google_compute_route" "route1" { - name = "route1-%{random_suffix}" + name = "route1%{random_suffix}" network = "${google_compute_network.network1.name}" dest_range = "15.0.0.0/24" priority = 1000 diff --git a/google/resource_dns_managed_zone_generated_test.go b/google/resource_dns_managed_zone_generated_test.go index d060aa2aa37..fe20e021b8c 100644 --- a/google/resource_dns_managed_zone_generated_test.go +++ b/google/resource_dns_managed_zone_generated_test.go @@ -92,7 +92,7 @@ func TestAccDnsManagedZone_dnsManagedZonePrivateExample(t *testing.T) { func testAccDnsManagedZone_dnsManagedZonePrivateExample(context map[string]interface{}) string { return Nprintf(` resource "google_dns_managed_zone" "private-zone" { - name = "private-zone-%{random_suffix}" + name = "private-zone%{random_suffix}" dns_name = "private.example.com." description = "Example private DNS zone" labels = { @@ -112,12 +112,12 @@ resource "google_dns_managed_zone" "private-zone" { } resource "google_compute_network" "network-1" { - name = "network-1-%{random_suffix}" + name = "network-1%{random_suffix}" auto_create_subnetworks = false } resource "google_compute_network" "network-2" { - name = "network-2-%{random_suffix}" + name = "network-2%{random_suffix}" auto_create_subnetworks = false } `, context) diff --git a/google/resource_filestore_instance_generated_test.go b/google/resource_filestore_instance_generated_test.go index c2f2d65c558..03d911255bf 100644 --- a/google/resource_filestore_instance_generated_test.go +++ b/google/resource_filestore_instance_generated_test.go @@ -52,7 +52,7 @@ func TestAccFilestoreInstance_filestoreInstanceBasicExample(t *testing.T) { func testAccFilestoreInstance_filestoreInstanceBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_filestore_instance" "instance" { - name = "test-instance-%{random_suffix}" + name = "test-instance%{random_suffix}" zone = "us-central1-b" tier = "PREMIUM" diff --git a/google/resource_logging_metric_generated_test.go b/google/resource_logging_metric_generated_test.go index 4ed9f421f79..06919e54c25 100644 --- a/google/resource_logging_metric_generated_test.go +++ b/google/resource_logging_metric_generated_test.go @@ -51,7 +51,7 @@ func TestAccLoggingMetric_loggingMetricBasicExample(t *testing.T) { func testAccLoggingMetric_loggingMetricBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_logging_metric" "logging_metric" { - name = "my-(custom)/metric-%{random_suffix}" + name = "my-(custom)/metric%{random_suffix}" filter = "resource.type=gae_app AND severity>=ERROR" metric_descriptor { metric_kind = "DELTA" diff --git a/google/resource_monitoring_group_generated_test.go b/google/resource_monitoring_group_generated_test.go index 6656700c136..fcb228e1448 100644 --- a/google/resource_monitoring_group_generated_test.go +++ b/google/resource_monitoring_group_generated_test.go @@ -51,7 +51,7 @@ func TestAccMonitoringGroup_monitoringGroupBasicExample(t *testing.T) { func testAccMonitoringGroup_monitoringGroupBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_monitoring_group" "basic" { - display_name = "New Test Group-%{random_suffix}" + display_name = "New Test Group%{random_suffix}" filter = "resource.metadata.region=\"europe-west2\"" } @@ -85,12 +85,12 @@ func TestAccMonitoringGroup_monitoringGroupSubgroupExample(t *testing.T) { func testAccMonitoringGroup_monitoringGroupSubgroupExample(context map[string]interface{}) string { return Nprintf(` resource "google_monitoring_group" "parent" { - display_name = "New Test SubGroup-%{random_suffix}" + display_name = "New Test SubGroup%{random_suffix}" filter = "resource.metadata.region=\"europe-west2\"" } resource "google_monitoring_group" "subgroup" { - display_name = "New Test SubGroup-%{random_suffix}" + display_name = "New Test SubGroup%{random_suffix}" filter = "resource.metadata.region=\"europe-west2\"" parent_name = "${google_monitoring_group.parent.name}" } diff --git a/google/resource_monitoring_notification_channel_generated_test.go b/google/resource_monitoring_notification_channel_generated_test.go index 9a0ef6aefdd..fb49e177f6d 100644 --- a/google/resource_monitoring_notification_channel_generated_test.go +++ b/google/resource_monitoring_notification_channel_generated_test.go @@ -51,7 +51,7 @@ func TestAccMonitoringNotificationChannel_notificationChannelBasicExample(t *tes func testAccMonitoringNotificationChannel_notificationChannelBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_monitoring_notification_channel" "basic" { - display_name = "Test Notification Channel-%{random_suffix}" + display_name = "Test Notification Channel%{random_suffix}" type = "email" labels = { email_address = "fake_email@blahblah.com" diff --git a/google/resource_monitoring_uptime_check_config_generated_test.go b/google/resource_monitoring_uptime_check_config_generated_test.go index e0964a10f08..95b011df304 100644 --- a/google/resource_monitoring_uptime_check_config_generated_test.go +++ b/google/resource_monitoring_uptime_check_config_generated_test.go @@ -51,7 +51,7 @@ func TestAccMonitoringUptimeCheckConfig_uptimeCheckConfigHttpExample(t *testing. func testAccMonitoringUptimeCheckConfig_uptimeCheckConfigHttpExample(context map[string]interface{}) string { return Nprintf(` resource "google_monitoring_uptime_check_config" "http" { - display_name = "http-uptime-check-%{random_suffix}" + display_name = "http-uptime-check%{random_suffix}" timeout = "60s" http_check { @@ -101,7 +101,7 @@ func TestAccMonitoringUptimeCheckConfig_uptimeCheckTcpExample(t *testing.T) { func testAccMonitoringUptimeCheckConfig_uptimeCheckTcpExample(context map[string]interface{}) string { return Nprintf(` resource "google_monitoring_uptime_check_config" "tcp_group" { - display_name = "tcp-uptime-check-%{random_suffix}" + display_name = "tcp-uptime-check%{random_suffix}" timeout = "60s" tcp_check { @@ -116,7 +116,7 @@ resource "google_monitoring_uptime_check_config" "tcp_group" { resource "google_monitoring_group" "check" { - display_name = "uptime-check-group-%{random_suffix}" + display_name = "uptime-check-group%{random_suffix}" filter = "resource.metadata.name=has_substring(\"foo\")" } `, context) diff --git a/google/resource_pubsub_subscription_generated_test.go b/google/resource_pubsub_subscription_generated_test.go index 9b8bd58a1e1..0be7ea539fb 100644 --- a/google/resource_pubsub_subscription_generated_test.go +++ b/google/resource_pubsub_subscription_generated_test.go @@ -51,11 +51,11 @@ func TestAccPubsubSubscription_pubsubSubscriptionPullExample(t *testing.T) { func testAccPubsubSubscription_pubsubSubscriptionPullExample(context map[string]interface{}) string { return Nprintf(` resource "google_pubsub_topic" "example" { - name = "example-topic-%{random_suffix}" + name = "example-topic%{random_suffix}" } resource "google_pubsub_subscription" "example" { - name = "example-subscription-%{random_suffix}" + name = "example-subscription%{random_suffix}" topic = "${google_pubsub_topic.example.name}" labels = { diff --git a/google/resource_pubsub_topic_generated_test.go b/google/resource_pubsub_topic_generated_test.go index 9555f2704d9..e402981e30d 100644 --- a/google/resource_pubsub_topic_generated_test.go +++ b/google/resource_pubsub_topic_generated_test.go @@ -51,7 +51,7 @@ func TestAccPubsubTopic_pubsubTopicBasicExample(t *testing.T) { func testAccPubsubTopic_pubsubTopicBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_pubsub_topic" "example" { - name = "example-topic-%{random_suffix}" + name = "example-topic%{random_suffix}" labels = { foo = "bar" diff --git a/google/resource_redis_instance_generated_test.go b/google/resource_redis_instance_generated_test.go index ea005d6959a..a83ccc5bd4d 100644 --- a/google/resource_redis_instance_generated_test.go +++ b/google/resource_redis_instance_generated_test.go @@ -52,7 +52,7 @@ func TestAccRedisInstance_redisInstanceBasicExample(t *testing.T) { func testAccRedisInstance_redisInstanceBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_redis_instance" "cache" { - name = "memory-cache-%{random_suffix}" + name = "memory-cache%{random_suffix}" memory_size_gb = 1 } `, context) @@ -86,7 +86,7 @@ func TestAccRedisInstance_redisInstanceFullExample(t *testing.T) { func testAccRedisInstance_redisInstanceFullExample(context map[string]interface{}) string { return Nprintf(` resource "google_redis_instance" "cache" { - name = "ha-memory-cache-%{random_suffix}" + name = "ha-memory-cache%{random_suffix}" tier = "STANDARD_HA" memory_size_gb = 1 @@ -106,7 +106,7 @@ resource "google_redis_instance" "cache" { } resource "google_compute_network" "auto-network" { - name = "authorized-network-%{random_suffix}" + name = "authorized-network%{random_suffix}" } `, context) } diff --git a/google/resource_source_repo_repository_generated_test.go b/google/resource_source_repo_repository_generated_test.go index 3c38247ca6a..ae232b8eb16 100644 --- a/google/resource_source_repo_repository_generated_test.go +++ b/google/resource_source_repo_repository_generated_test.go @@ -51,7 +51,7 @@ func TestAccSourceRepoRepository_sourcerepoRepositoryBasicExample(t *testing.T) func testAccSourceRepoRepository_sourcerepoRepositoryBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_sourcerepo_repository" "my-repo" { - name = "my-repository-%{random_suffix}" + name = "my-repository%{random_suffix}" } `, context) } diff --git a/google/resource_spanner_database_generated_test.go b/google/resource_spanner_database_generated_test.go index ba50b37f33d..31db56927ee 100644 --- a/google/resource_spanner_database_generated_test.go +++ b/google/resource_spanner_database_generated_test.go @@ -58,7 +58,7 @@ resource "google_spanner_instance" "main" { resource "google_spanner_database" "database" { instance = "${google_spanner_instance.main.name}" - name = "my-database-%{random_suffix}" + name = "my-database%{random_suffix}" ddl = [ "CREATE TABLE t1 (t1 INT64 NOT NULL,) PRIMARY KEY(t1)", "CREATE TABLE t2 (t2 INT64 NOT NULL,) PRIMARY KEY(t2)" diff --git a/google/resource_storage_default_object_access_control_generated_test.go b/google/resource_storage_default_object_access_control_generated_test.go index a4055d9a39a..ae8d0050596 100644 --- a/google/resource_storage_default_object_access_control_generated_test.go +++ b/google/resource_storage_default_object_access_control_generated_test.go @@ -58,7 +58,7 @@ resource "google_storage_default_object_access_control" "public_rule" { } resource "google_storage_bucket" "bucket" { - name = "static-content-bucket-%{random_suffix}" + name = "static-content-bucket%{random_suffix}" } `, context) } diff --git a/google/resource_storage_object_access_control_generated_test.go b/google/resource_storage_object_access_control_generated_test.go index 3e570b6ee7a..a4e75da665e 100644 --- a/google/resource_storage_object_access_control_generated_test.go +++ b/google/resource_storage_object_access_control_generated_test.go @@ -58,11 +58,11 @@ resource "google_storage_object_access_control" "public_rule" { } resource "google_storage_bucket" "bucket" { - name = "static-content-bucket-%{random_suffix}" + name = "static-content-bucket%{random_suffix}" } resource "google_storage_bucket_object" "object" { - name = "public-object-%{random_suffix}" + name = "public-object%{random_suffix}" bucket = "${google_storage_bucket.bucket.name}" source = "test-fixtures/header-logo.png" } diff --git a/google/resource_tpu_node_generated_test.go b/google/resource_tpu_node_generated_test.go index fa9df3a6882..89271f3fe4a 100644 --- a/google/resource_tpu_node_generated_test.go +++ b/google/resource_tpu_node_generated_test.go @@ -54,7 +54,7 @@ func testAccTpuNode_tpuNodeBasicExample(context map[string]interface{}) string { data "google_tpu_tensorflow_versions" "available" { } resource "google_tpu_node" "tpu" { - name = "test-tpu-%{random_suffix}" + name = "test-tpu%{random_suffix}" zone = "us-central1-b" accelerator_type = "v3-8" @@ -94,7 +94,7 @@ func testAccTpuNode_tpuNodeFullExample(context map[string]interface{}) string { data "google_tpu_tensorflow_versions" "available" { } resource "google_tpu_node" "tpu" { - name = "test-tpu-%{random_suffix}" + name = "test-tpu%{random_suffix}" zone = "us-central1-b" accelerator_type = "v3-8"