Bring forwards/backwards compatible 0.12 syntax to HEAD (#2984)

<!-- This change is generated by MagicModules. -->
/cc @rileykarson

google/data_source_google_compute_instance_test.go

@@ -113,10 +113,7 @@ resource "google_compute_instance" "foo" {
 	metadata = {
 		foo = "bar"
 		baz = "qux"
-	}
+        startup-script = "echo Hello"
-
-	metadata = {
-		startup-script = "echo Hello"
 	}
 
 	labels = {

google/resource_cloudiot_registry_test.go

@@ -168,14 +168,12 @@ resource "google_cloudiot_registry" "foobar" {
     mqtt_enabled_state = "MQTT_DISABLED"
   }
 
-  credentials = [
+  credentials {
-    {
+    "public_key_certificate" = {
-      "public_key_certificate" = {
+      format      = "X509_CERTIFICATE_PEM"
-        format      = "X509_CERTIFICATE_PEM"
+      certificate = "${file("test-fixtures/rsa_cert.pem")}"
-        certificate = "${file("test-fixtures/rsa_cert.pem")}"
+    }
-      }
+  }
-    },
-  ]
 }
 `, acctest.RandString(10), acctest.RandString(10), registryName)
 }

google/resource_container_cluster_test.go

@@ -1448,6 +1448,7 @@ resource "google_container_cluster" "with_network_policy_enabled" {
 		enabled = true
 		provider = "CALICO"
 	}
+
 	addons_config {
 		network_policy_config {
 			disabled = false
@@ -1474,7 +1475,7 @@ resource "google_container_cluster" "with_network_policy_enabled" {
 	initial_node_count = 1
 	remove_default_node_pool = true
 
-	network_policy = {}
+	network_policy {}
 }`, clusterName)
 }
 
@@ -1486,7 +1487,8 @@ resource "google_container_cluster" "with_network_policy_enabled" {
 	initial_node_count = 1
 	remove_default_node_pool = true
 
-	network_policy = {}
+	network_policy {}
+
 	addons_config {
 		network_policy_config {
 			disabled = true
@@ -1500,15 +1502,13 @@ func testAccContainerCluster_withMasterAuthorizedNetworksConfig(clusterName stri
 	cidrBlocks := emptyValue
 	if len(cidrs) > 0 {
 		var buf bytes.Buffer
-		buf.WriteString("cidr_blocks = [")
 		for _, c := range cidrs {
 			buf.WriteString(fmt.Sprintf(`
-			{
+			cidr_blocks {
 				cidr_block = "%s"
 				display_name = "disp-%s"
-			},`, c, c))
+			}`, c, c))
 		}
-		buf.WriteString("]")
 		cidrBlocks = buf.String()
 	}
 

google/resource_container_node_pool_test.go

@@ -709,14 +709,18 @@ resource "google_container_cluster" "cluster" {
 	node_version = "${data.google_container_engine_versions.central1c.latest_node_version}"
 	min_master_version = "${data.google_container_engine_versions.central1c.latest_master_version}"
 }
+
 resource "google_container_node_pool" "np_with_gpu" {
 	name = "tf-nodepool-test-%s"
 	zone = "us-central1-c"
 	cluster = "${google_container_cluster.cluster.name}"
+
 	initial_node_count = 1
+
 	node_config {
 		machine_type = "n1-standard-1"
 		disk_size_gb = 10
+
 		oauth_scopes = [
 			"https://www.googleapis.com/auth/devstorage.read_only", 
 			"https://www.googleapis.com/auth/logging.write", 
@@ -725,15 +729,15 @@ resource "google_container_node_pool" "np_with_gpu" {
 			"https://www.googleapis.com/auth/servicecontrol", 
 			"https://www.googleapis.com/auth/trace.append"
 		]
+
 		preemptible = true
 		service_account = "default"
 		image_type = "COS"
-		guest_accelerator = [
+
-			{
+		guest_accelerator {
-				type = "nvidia-tesla-k80"
+			type = "nvidia-tesla-k80"
-				count = 1
+			count = 1
-			}
+		}
-		]
 	}
 }`, acctest.RandString(10), acctest.RandString(10))
 }

google/resource_google_folder_iam_policy_test.go

@@ -1,7 +1,6 @@
 package google
 
 import (
-	"bytes"
 	"fmt"
 	"reflect"
 	"testing"
@@ -19,37 +18,6 @@ func TestAccFolderIamPolicy_basic(t *testing.T) {
 	org := getTestOrgFromEnv(t)
 	parent := "organizations/" + org
 
-	policy := &resourceManagerV2Beta1.Policy{
-		Bindings: []*resourceManagerV2Beta1.Binding{
-			{
-				Role: "roles/viewer",
-				Members: []string{
-					"user:admin@hashicorptest.com",
-				},
-			},
-		},
-	}
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckGoogleFolderIamPolicyDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccFolderIamPolicy_basic(folderDisplayName, parent, policy),
-				Check:  testAccCheckGoogleFolderIamPolicy("google_folder_iam_policy.test", policy),
-			},
-		},
-	})
-}
-
-func TestAccFolderIamPolicy_update(t *testing.T) {
-	t.Parallel()
-
-	folderDisplayName := "tf-test-" + acctest.RandString(10)
-	org := getTestOrgFromEnv(t)
-	parent := "organizations/" + org
-
 	policy1 := &resourceManagerV2Beta1.Policy{
 		Bindings: []*resourceManagerV2Beta1.Binding{
 			{
@@ -83,11 +51,11 @@ func TestAccFolderIamPolicy_update(t *testing.T) {
 		CheckDestroy: testAccCheckGoogleFolderIamPolicyDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccFolderIamPolicy_basic(folderDisplayName, parent, policy1),
+				Config: testAccFolderIamPolicy_basic(folderDisplayName, parent, "roles/viewer", "user:admin@hashicorptest.com"),
 				Check:  testAccCheckGoogleFolderIamPolicy("google_folder_iam_policy.test", policy1),
 			},
 			{
-				Config: testAccFolderIamPolicy_basic(folderDisplayName, parent, policy2),
+				Config: testAccFolderIamPolicy_basic2(folderDisplayName, parent, "roles/editor", "user:admin@hashicorptest.com", "roles/viewer", "user:admin@hashicorptest.com"),
 				Check:  testAccCheckGoogleFolderIamPolicy("google_folder_iam_policy.test", policy2),
 			},
 		},
@@ -162,18 +130,7 @@ func testAccFolderExistingPolicy(org, fname string) resource.TestCheckFunc {
 	}
 }
 
-func testAccFolderIamPolicy_basic(folder, parent string, policy *resourceManagerV2Beta1.Policy) string {
+func testAccFolderIamPolicy_basic(folder, parent, role, member string) string {
-	var bindingBuffer bytes.Buffer
-
-	for _, binding := range policy.Bindings {
-		bindingBuffer.WriteString("binding {\n")
-		bindingBuffer.WriteString(fmt.Sprintf("role = \"%s\"\n", binding.Role))
-		bindingBuffer.WriteString(fmt.Sprintf("members = [\n"))
-		for _, member := range binding.Members {
-			bindingBuffer.WriteString(fmt.Sprintf("\"%s\",\n", member))
-		}
-		bindingBuffer.WriteString("]}\n")
-	}
 	return fmt.Sprintf(`
 resource "google_folder" "permissiontest" {
   display_name = "%s"
@@ -181,12 +138,41 @@ resource "google_folder" "permissiontest" {
 }
 
 data "google_iam_policy" "test" {
-  %s
+  binding {
+    role = "%s"
+    members = ["%s"]
+  }
 }
 
 resource "google_folder_iam_policy" "test" {
   folder = "${google_folder.permissiontest.name}"
   policy_data = "${data.google_iam_policy.test.policy_data}"
 }
-`, folder, parent, bindingBuffer.String())
+`, folder, parent, role, member)
+}
+
+func testAccFolderIamPolicy_basic2(folder, parent, role, member, role2, member2 string) string {
+	return fmt.Sprintf(`
+resource "google_folder" "permissiontest" {
+  display_name = "%s"
+  parent = "%s"
+}
+
+data "google_iam_policy" "test" {
+  binding {
+    role = "%s"
+    members = ["%s"]
+  }
+
+  binding {
+    role = "%s"
+    members = ["%s"]
+  }
+}
+
+resource "google_folder_iam_policy" "test" {
+  folder = "${google_folder.permissiontest.name}"
+  policy_data = "${data.google_iam_policy.test.policy_data}"
+}
+`, folder, parent, role, member, role2, member2)
 }

google/resource_google_project_iam_policy_test.go

@@ -380,31 +380,25 @@ data "google_iam_policy" "admin" {
   }
   audit_config {
     service = "cloudkms.googleapis.com"
-    audit_log_configs = [
+    audit_log_configs {
-      {
+      log_type = "DATA_READ"
-        log_type = "DATA_READ"
+      exempted_members = ["user:paddy@hashicorp.com"]
-        exempted_members = [
+    }
-	  "user:paddy@hashicorp.com",
+
-        ]
+    audit_log_configs {
-      },
+      log_type = "DATA_WRITE"
-      {
+    }
-        log_type = "DATA_WRITE"
-      }
-    ]
   }
   audit_config {
     service = "cloudsql.googleapis.com"
-    audit_log_configs = [
+    audit_log_configs {
-      {
+      log_type = "DATA_READ"
-        log_type = "DATA_READ"
+      exempted_members = ["user:paddy@hashicorp.com"]
-        exempted_members = [
+    }
-	  "user:paddy@hashicorp.com",
+
-        ]
+    audit_log_configs {
-      },
+      log_type = "DATA_WRITE"
-      {
+    }
-        log_type = "DATA_WRITE"
-      }
-    ]
   }
 }
 `, pid, name, org)
@@ -476,31 +470,25 @@ data "google_iam_policy" "expanded" {
   }
   audit_config {
     service = "cloudkms.googleapis.com"
-    audit_log_configs = [
+    audit_log_configs {
-      {
+      log_type = "DATA_READ"
-        log_type = "DATA_READ"
+      exempted_members = ["user:paddy@hashicorp.com"]
-        exempted_members = [
+    }
-	  "user:paddy@hashicorp.com",
+
-        ]
+    audit_log_configs {
-      },
+      log_type = "DATA_WRITE"
-      {
+    }
-        log_type = "DATA_WRITE"
-      }
-    ]
   }
   audit_config {
     service = "cloudkms.googleapis.com"
-    audit_log_configs = [
+    audit_log_configs {
-      {
+      log_type = "DATA_READ"
-        log_type = "DATA_READ"
+      exempted_members = ["user:paddy@hashicorp.com"]
-        exempted_members = [
+    }
-	  "user:paddy@carvers.co",
+
-        ]
+    audit_log_configs {
-      },
+      log_type = "DATA_WRITE"
-      {
+    }
-        log_type = "ADMIN_READ"
-      }
-    ]
   }
 }`, pid, name, org)
 }

google/resource_logging_organization_sink_test.go

@@ -207,7 +207,6 @@ resource "google_logging_organization_sink" "update" {
 	org_id           = "%s"
 	destination      = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
 	filter           = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
-	destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
 	include_children = false
 }
 

google/resource_monitoring_alert_policy_generated_test.go

@@ -53,22 +53,18 @@ func testAccMonitoringAlertPolicy_monitoringAlertPolicyBasicExample(context map[
 resource "google_monitoring_alert_policy" "alert_policy" {
   display_name = "My Alert Policy-%{random_suffix}"
   combiner = "OR"
-  conditions = [
+  conditions {
-    {
+    display_name = "test condition"
-      display_name = "test condition"
+    condition_threshold {
-      condition_threshold {
+      filter = "metric.type=\"compute.googleapis.com/instance/disk/write_bytes_count\" AND resource.type=\"gce_instance\""
-        filter = "metric.type=\"compute.googleapis.com/instance/disk/write_bytes_count\" AND resource.type=\"gce_instance\""
+      duration = "60s"
-        duration = "60s"
+      comparison = "COMPARISON_GT"
-        comparison = "COMPARISON_GT"
+      aggregations {
-        aggregations = [
+        alignment_period = "60s"
-          {
+        per_series_aligner = "ALIGN_RATE"
-            alignment_period = "60s"
-            per_series_aligner = "ALIGN_RATE"
-          }
-        ]
       }
     }
-  ]
+  }
 }
 `, context)
 }

google/resource_redis_instance_test.go

@@ -51,7 +51,7 @@ resource "google_redis_instance" "test" {
 		other_key = "other_val"
 	}
 
-	redis_configs {
+	redis_configs = {
 		maxmemory-policy       = "allkeys-lru"
 		notify-keyspace-events = "KEA"
 	}
@@ -70,7 +70,7 @@ resource "google_redis_instance" "test" {
 		other_key = "new_val"
 	}
 
-	redis_configs {
+	redis_configs = {
 		maxmemory-policy       = "noeviction"
 		notify-keyspace-events = ""
 	}

google/resource_spanner_instance_generated_test.go

@@ -54,7 +54,7 @@ resource "google_spanner_instance" "example" {
   config        = "regional-us-central1"
   display_name  = "Test Spanner Instance"
   num_nodes     = 2
-  labels {
+  labels = {
     "foo" = "bar"
   }
 }

google/resource_storage_bucket_test.go

@@ -921,8 +921,8 @@ func testAccStorageBucket_forceDestroyWithVersioning(bucketName string) string {
 resource "google_storage_bucket" "bucket" {
 	name = "%s"
 	force_destroy = "true"
-	versioning = {
+	versioning {
-		enabled = "true"
+	  enabled = "true"
 	}
 }
 `, bucketName)
@@ -932,8 +932,8 @@ func testAccStorageBucket_versioning(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
 	name = "%s"
-	versioning = {
+	versioning {
-		enabled = "true"
+	  enabled = "true"
 	}
 }
 `, bucketName)
@@ -943,7 +943,7 @@ func testAccStorageBucket_logging(bucketName string, logBucketName string) strin
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
 	name = "%s"
-	logging = {
+	logging {
 		log_bucket = "%s"
 	}
 }
@@ -954,7 +954,7 @@ func testAccStorageBucket_loggingWithPrefix(bucketName string, logBucketName str
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
 	name = "%s"
-	logging = {
+	logging {
 		log_bucket = "%s"
 		log_object_prefix = "%s"
 	}

website/docs/d/google_iam_policy.html.markdown

@@ -32,20 +32,18 @@ data "google_iam_policy" "admin" {
 
   audit_config {
     service = "cloudkms.googleapis.com"
-    audit_log_configs = [
+    audit_log_configs {
-      {
+      log_type = "DATA_READ",
-        log_type = "DATA_READ",
+      exempted_members = ["user:you@domain.com"]
-        exempted_members = [
+    }
-          "user:you@domain.com",
+    
-        ]
+    audit_log_configs {
-      },
+      "logType": "DATA_WRITE",
-      {
+    }
-        "logType": "DATA_WRITE",
+    
-      },
+    audit_log_configs {
-      {
+      "logType": "ADMIN_READ",
-        "logType": "ADMIN_READ",
+    }
-      }
-    ]
   }
 }
 ```

website/docs/r/monitoring_alert_policy.html.markdown

@@ -46,22 +46,18 @@ To get more information about AlertPolicy, see:
 resource "google_monitoring_alert_policy" "alert_policy" {
   display_name = "My Alert Policy"
   combiner = "OR"
-  conditions = [
+  conditions {
-    {
+    display_name = "test condition"
-      display_name = "test condition"
+    condition_threshold {
-      condition_threshold {
+      filter = "metric.type=\"compute.googleapis.com/instance/disk/write_bytes_count\" AND resource.type=\"gce_instance\""
-        filter = "metric.type=\"compute.googleapis.com/instance/disk/write_bytes_count\" AND resource.type=\"gce_instance\""
+      duration = "60s"
-        duration = "60s"
+      comparison = "COMPARISON_GT"
-        comparison = "COMPARISON_GT"
+      aggregations {
-        aggregations = [
+        alignment_period = "60s"
-          {
+        per_series_aligner = "ALIGN_RATE"
-            alignment_period = "60s"
-            per_series_aligner = "ALIGN_RATE"
-          }
-        ]
       }
     }
-  ]
+  }
 }
 ```
 

website/docs/r/spanner_instance.html.markdown

@@ -45,7 +45,7 @@ resource "google_spanner_instance" "example" {
   config        = "regional-us-central1"
   display_name  = "Test Spanner Instance"
   num_nodes     = 2
-  labels {
+  labels = {
     "foo" = "bar"
   }
 }