[terraform] removing dash in random suffix for examples (#4087)

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

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"

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

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

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"

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"
 

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

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)

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

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"

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)
 }

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

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)
 }

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

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

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

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

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"