diff --git a/google/data_source_google_compute_instance_test.go b/google/data_source_google_compute_instance_test.go
index dbd86ac3..e4b9ee94 100644
--- a/google/data_source_google_compute_instance_test.go
+++ b/google/data_source_google_compute_instance_test.go
@@ -110,16 +110,16 @@ resource "google_compute_instance" "foo" {
     	}
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 		baz = "qux"
 	}
 
-	metadata {
+	metadata = {
 		startup-script = "echo Hello"
 	}
 
-	labels {
+	labels = {
 		my_key       = "my_value"
 		my_other_key = "my_other_value"
     }
diff --git a/google/data_source_storage_object_signed_url_test.go b/google/data_source_storage_object_signed_url_test.go
index 46a888ea..1f68c3a2 100644
--- a/google/data_source_storage_object_signed_url_test.go
+++ b/google/data_source_storage_object_signed_url_test.go
@@ -245,7 +245,7 @@ data "google_storage_object_signed_url" "story_url" {
 data "google_storage_object_signed_url" "story_url_w_headers" {
   bucket = "${google_storage_bucket.bucket.name}"
   path   = "${google_storage_bucket_object.story.name}"
-  extension_headers {
+  extension_headers = {
   	x-goog-test = "foo"
   	x-goog-if-generation-match = 1
   }
diff --git a/google/resource_bigquery_dataset_test.go b/google/resource_bigquery_dataset_test.go
index 9b162d15..439c1a20 100644
--- a/google/resource_bigquery_dataset_test.go
+++ b/google/resource_bigquery_dataset_test.go
@@ -190,7 +190,7 @@ resource "google_bigquery_dataset" "test" {
   default_partition_expiration_ms = 3600000
   default_table_expiration_ms = 3600000
 
-  labels {
+  labels = {
     env                         = "foo"
     default_table_expiration_ms = 3600000
   }
@@ -207,7 +207,7 @@ resource "google_bigquery_dataset" "test" {
   default_partition_expiration_ms = 7200000
   default_table_expiration_ms = 7200000
 
-  labels {
+  labels = {
     env                         = "bar"
     default_table_expiration_ms = 7200000
   }
@@ -223,7 +223,7 @@ resource "google_bigquery_dataset" "test" {
   location                    = "%s"
   default_table_expiration_ms = 3600000
 
-  labels {
+  labels = {
     env                         = "foo"
     default_table_expiration_ms = 3600000
   }
@@ -240,7 +240,7 @@ resource "google_bigquery_dataset" "access_test" {
     user_by_email = "Joe@example.com"
   }
 
-  labels {
+  labels = {
     env                         = "foo"
     default_table_expiration_ms = 3600000
   }
@@ -261,7 +261,7 @@ resource "google_bigquery_dataset" "access_test" {
     domain = "example.com"
   }
 
-  labels {
+  labels = {
     env                         = "foo"
     default_table_expiration_ms = 3600000
   }
@@ -305,7 +305,7 @@ resource "google_bigquery_dataset" "access_test" {
     }
   }
 
-  labels {
+  labels = {
     env                         = "foo"
     default_table_expiration_ms = 3600000
   }
diff --git a/google/resource_cloudbuild_build_trigger_test.go b/google/resource_cloudbuild_build_trigger_test.go
index fa4d6dad..67b9201a 100644
--- a/google/resource_cloudbuild_build_trigger_test.go
+++ b/google/resource_cloudbuild_build_trigger_test.go
@@ -300,7 +300,7 @@ resource "google_cloudbuild_trigger" "filename_build_trigger" {
     branch_name = "master"
     repo_name   = "some-repo"
   }
-  substitutions {
+  substitutions = {
     _FOO = "bar"
     _BAZ = "qux"
   }
diff --git a/google/resource_cloudfunctions_function_test.go b/google/resource_cloudfunctions_function_test.go
index f9344bc5..0b600aab 100644
--- a/google/resource_cloudfunctions_function_test.go
+++ b/google/resource_cloudfunctions_function_test.go
@@ -427,10 +427,10 @@ resource "google_cloudfunctions_function" "function" {
   trigger_http          = true
   timeout               = 61
   entry_point           = "helloGET"
-  labels {
+  labels = {
 	my-label = "my-label-value"
   }
-  environment_variables {
+  environment_variables = {
 	TEST_ENV_VARIABLE = "test-env-variable-value"
   }
 }
@@ -459,11 +459,11 @@ resource "google_cloudfunctions_function" "function" {
   runtime               = "nodejs8"
   timeout               = 91
   entry_point           = "helloGET"
-  labels {
+  labels = {
 	my-label = "my-updated-label-value"
 	a-new-label = "a-new-label-value"
   }
-  environment_variables {
+  environment_variables = {
 	TEST_ENV_VARIABLE = "test-env-variable-value"
 	NEW_ENV_VARIABLE = "new-env-variable-value"
   }
diff --git a/google/resource_composer_environment_test.go b/google/resource_composer_environment_test.go
index f2b759d0..8f83c3d4 100644
--- a/google/resource_composer_environment_test.go
+++ b/google/resource_composer_environment_test.go
@@ -244,21 +244,21 @@ resource "google_composer_environment" "test" {
 		node_count = 4
 
 		software_config {
-			airflow_config_overrides {
+			airflow_config_overrides = {
 			  core-load_example = "True"
 			}
 
-			pypi_packages {
+			pypi_packages = {
 			  numpy = ""
 			}
 
-			env_variables {
+			env_variables = {
 			   FOO = "bar"
 			}
 		}
  	}
 
-	labels {
+	labels = {
  		foo = "bar"
 		anotherlabel = "boo"
  	}
@@ -315,7 +315,7 @@ resource "google_composer_environment" "test" {
 	region = "us-central1"
 	config {
 		software_config {
-			pypi_packages {
+			pypi_packages = {
 			  scipy = "==1.1.0"
 			}
 		}
diff --git a/google/resource_compute_autoscaler_generated_test.go b/google/resource_compute_autoscaler_generated_test.go
index a431e036..3a6e6a54 100644
--- a/google/resource_compute_autoscaler_generated_test.go
+++ b/google/resource_compute_autoscaler_generated_test.go
@@ -76,7 +76,7 @@ resource "google_compute_instance_template" "foobar" {
     network = "default"
   }
 
-  metadata {
+  metadata = {
     foo = "bar"
   }
 
diff --git a/google/resource_compute_autoscaler_test.go b/google/resource_compute_autoscaler_test.go
index de6b88ae..be4f6457 100644
--- a/google/resource_compute_autoscaler_test.go
+++ b/google/resource_compute_autoscaler_test.go
@@ -222,10 +222,6 @@ resource "google_compute_instance_template" "foobar" {
 		network = "default"
 	}
 
-	metadata {
-		foo = "bar"
-	}
-
 	service_account {
 		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 	}
diff --git a/google/resource_compute_disk_generated_test.go b/google/resource_compute_disk_generated_test.go
index 491eae1d..0062eda7 100644
--- a/google/resource_compute_disk_generated_test.go
+++ b/google/resource_compute_disk_generated_test.go
@@ -50,7 +50,7 @@ resource "google_compute_disk" "default" {
   type  = "pd-ssd"
   zone  = "us-central1-a"
   image = "debian-8-jessie-v20170523"
-  labels {
+  labels = {
     environment = "dev"
   }
 }
diff --git a/google/resource_compute_disk_test.go b/google/resource_compute_disk_test.go
index 7be01f7f..f1ba1b46 100644
--- a/google/resource_compute_disk_test.go
+++ b/google/resource_compute_disk_test.go
@@ -578,7 +578,7 @@ resource "google_compute_disk" "foobar" {
 	size = 50
 	type = "pd-ssd"
 	zone = "us-central1-a"
-	labels {
+	labels = {
 		my-label = "my-label-value"
 	}
 }`, diskName)
@@ -616,7 +616,7 @@ resource "google_compute_disk" "foobar" {
 	size = 100
 	type = "pd-ssd"
 	zone = "us-central1-a"
-	labels {
+	labels = {
 		my-label = "my-updated-label-value"
 		a-new-label = "a-new-label-value"
 	}
diff --git a/google/resource_compute_instance_from_template_test.go b/google/resource_compute_instance_from_template_test.go
index 83a465df..aad76d32 100644
--- a/google/resource_compute_instance_from_template_test.go
+++ b/google/resource_compute_instance_from_template_test.go
@@ -179,7 +179,7 @@ resource "google_compute_instance_template" "foobar" {
 		network = "default"
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 
@@ -194,7 +194,7 @@ resource "google_compute_instance_from_template" "foobar" {
 
 	// Overrides
 	can_ip_forward = false
-	labels {
+	labels = {
 		my_key       = "my_value"
 	}
 }
@@ -245,7 +245,7 @@ resource "google_compute_instance_template" "template" {
 		network = "default"
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 
diff --git a/google/resource_compute_instance_group_manager_test.go b/google/resource_compute_instance_group_manager_test.go
index fe77618e..c50bc2b8 100644
--- a/google/resource_compute_instance_group_manager_test.go
+++ b/google/resource_compute_instance_group_manager_test.go
@@ -228,10 +228,6 @@ func testAccInstanceGroupManager_basic(template, target, igm1, igm2 string) stri
 			network = "default"
 		}
 
-		metadata {
-			foo = "bar"
-		}
-
 		service_account {
 			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 		}
@@ -287,10 +283,6 @@ func testAccInstanceGroupManager_targetSizeZero(template, igm string) string {
 			network = "default"
 		}
 
-		metadata {
-			foo = "bar"
-		}
-
 		service_account {
 			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 		}
@@ -329,10 +321,6 @@ func testAccInstanceGroupManager_update(template, target, igm string) string {
 			network = "default"
 		}
 
-		metadata {
-			foo = "bar"
-		}
-
 		service_account {
 			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 		}
@@ -383,10 +371,6 @@ func testAccInstanceGroupManager_update2(template1, target1, target2, template2,
 			network = "default"
 		}
 
-		metadata {
-			foo = "bar"
-		}
-
 		service_account {
 			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 		}
@@ -420,10 +404,6 @@ func testAccInstanceGroupManager_update2(template1, target1, target2, template2,
 			network = "default"
 		}
 
-		metadata {
-			foo = "bar"
-		}
-
 		service_account {
 			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 		}
@@ -564,10 +544,6 @@ func testAccInstanceGroupManager_separateRegions(igm1, igm2 string) string {
 			network = "default"
 		}
 
-		metadata {
-			foo = "bar"
-		}
-
 		service_account {
 			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 		}
diff --git a/google/resource_compute_instance_template_test.go b/google/resource_compute_instance_template_test.go
index 7c8090fb..fb986819 100644
--- a/google/resource_compute_instance_template_test.go
+++ b/google/resource_compute_instance_template_test.go
@@ -795,7 +795,7 @@ resource "google_compute_instance_template" "foobar" {
 		automatic_restart = true
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 
@@ -803,7 +803,7 @@ resource "google_compute_instance_template" "foobar" {
 		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 	}
 
-    labels {
+    labels = {
         my_label = "foobar"
     }
 }`, acctest.RandString(10))
@@ -848,7 +848,7 @@ resource "google_compute_instance_template" "foobar" {
 		automatic_restart = true
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 
@@ -856,7 +856,7 @@ resource "google_compute_instance_template" "foobar" {
 		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 	}
 
-    labels {
+    labels = {
         my_label = "foobar"
     }
 }`, acctest.RandString(10), acctest.RandString(10))
@@ -890,7 +890,7 @@ resource "google_compute_instance_template" "foobar" {
 		automatic_restart = false
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 
@@ -927,7 +927,7 @@ resource "google_compute_instance_template" "foobar" {
 		}
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 }`, acctest.RandString(10), acctest.RandString(10))
@@ -978,7 +978,7 @@ resource "google_compute_instance_template" "foobar" {
 		network_ip = "%s"
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 }`, acctest.RandString(10), networkIP)
@@ -1005,7 +1005,7 @@ resource "google_compute_instance_template" "foobar" {
 		network_ip    = "%s"
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 }`, acctest.RandString(10), ipAddress)
@@ -1047,7 +1047,7 @@ resource "google_compute_instance_template" "foobar" {
 		network = "default"
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 }`, acctest.RandString(10), acctest.RandString(10))
@@ -1089,7 +1089,7 @@ resource "google_compute_instance_template" "foobar" {
 		network = "default"
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 }`, acctest.RandString(10), acctest.RandString(10))
@@ -1122,7 +1122,7 @@ func testAccComputeInstanceTemplate_subnet_auto(network string) string {
 			network = "${google_compute_network.auto-network.name}"
 		}
 
-		metadata {
+		metadata = {
 			foo = "bar"
 		}
 	}`, network, acctest.RandString(10))
@@ -1163,7 +1163,7 @@ resource "google_compute_instance_template" "foobar" {
 		subnetwork = "${google_compute_subnetwork.subnetwork.name}"
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 }`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
@@ -1240,7 +1240,7 @@ func testAccComputeInstanceTemplate_subnet_xpn(org, billingId, projectName strin
 			subnetwork_project = "${google_compute_subnetwork.subnetwork.project}"
 		}
 
-		metadata {
+		metadata = {
 			foo = "bar"
 		}
 		project = "${google_compute_shared_vpc_service_project.service_project.service_project}"
@@ -1265,7 +1265,7 @@ resource "google_compute_instance_template" "foobar" {
 		boot = true
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 
@@ -1295,7 +1295,7 @@ resource "google_compute_instance_template" "foobar" {
 		boot = true
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 
@@ -1338,7 +1338,7 @@ resource "google_compute_instance_template" "foobar" {
 		boot = true
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 
@@ -1501,7 +1501,7 @@ resource "google_compute_instance_template" "foobar" {
 		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 	}
 
-    labels {
+    labels = {
         my_label = "foobar"
     }
 }`, pid, pname, org, billing, keyRingName, keyName, acctest.RandString(10))
diff --git a/google/resource_compute_instance_test.go b/google/resource_compute_instance_test.go
index 273a97d5..b4500a2f 100644
--- a/google/resource_compute_instance_test.go
+++ b/google/resource_compute_instance_test.go
@@ -1539,16 +1539,13 @@ resource "google_compute_instance" "foobar" {
 		network = "default"
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 		baz = "qux"
-	}
-
-	metadata {
 		startup-script = "echo Hello"
 	}
 
-	labels {
+	labels = {
 		my_key       = "my_value"
 		my_other_key = "my_other_value"
 	}
@@ -1580,7 +1577,7 @@ resource "google_compute_instance" "foobar" {
 		network = "default"
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 }
@@ -1611,7 +1608,7 @@ resource "google_compute_instance" "foobar" {
 		network = "default"
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 }
@@ -1643,7 +1640,7 @@ resource "google_compute_instance" "foobar" {
 	}
 
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 }
@@ -1674,7 +1671,7 @@ resource "google_compute_instance" "foobar" {
 		network = "default"
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 }
@@ -1763,7 +1760,7 @@ resource "google_compute_instance" "foobar" {
 		access_config { }
 	}
 
-	metadata {
+	metadata = {
 		qux = "true"
 	}
 }
@@ -1796,12 +1793,12 @@ resource "google_compute_instance" "foobar" {
 		access_config { }
 	}
 
-	metadata {
+	metadata = {
 		bar            = "baz"
 		startup-script = "echo Hello"
 	}
 
-	labels {
+	labels = {
 		only_me = "nothing_else"
 	}
 }
@@ -1838,7 +1835,7 @@ resource "google_compute_instance" "foobar" {
 		}
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 }
@@ -1871,7 +1868,7 @@ resource "google_compute_instance" "foobar" {
 		}
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 }
@@ -1992,7 +1989,7 @@ resource "google_compute_instance" "foobar" {
 		network = "default"
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 }
@@ -2681,7 +2678,7 @@ resource "google_compute_instance" "foobar" {
 		network = "default"
 	}
 
-	metadata {
+	metadata = {
 		foo = "bar"
 	}
 }
diff --git a/google/resource_compute_project_metadata_test.go b/google/resource_compute_project_metadata_test.go
index 17f9db8d..e1f0a6e2 100644
--- a/google/resource_compute_project_metadata_test.go
+++ b/google/resource_compute_project_metadata_test.go
@@ -135,7 +135,7 @@ resource "google_project_service" "compute" {
 
 resource "google_compute_project_metadata" "fizzbuzz" {
   project = "${google_project.project.project_id}"
-  metadata {
+  metadata = {
     banana = "orange"
     sofa = "darwinism"
   }
@@ -159,7 +159,7 @@ resource "google_project_service" "compute" {
 
 resource "google_compute_project_metadata" "fizzbuzz" {
   project = "${google_project.project.project_id}"
-  metadata {
+  metadata = {
     kiwi = "papaya"
     finches = "darwinism"
   }
@@ -183,7 +183,7 @@ resource "google_project_service" "compute" {
 
 resource "google_compute_project_metadata" "fizzbuzz" {
   project = "${google_project.project.project_id}"
-  metadata {
+  metadata = {
     paper = "pen"
     genghis_khan = "french bread"
     happy = "smiling"
@@ -208,7 +208,7 @@ resource "google_project_service" "compute" {
 
 resource "google_compute_project_metadata" "fizzbuzz" {
   project = "${google_project.project.project_id}"
-  metadata {
+  metadata = {
     paper = "pen"
     paris = "french bread"
     happy = "laughing"
diff --git a/google/resource_compute_region_autoscaler_generated_test.go b/google/resource_compute_region_autoscaler_generated_test.go
index 8e9aee5c..eab7e63c 100644
--- a/google/resource_compute_region_autoscaler_generated_test.go
+++ b/google/resource_compute_region_autoscaler_generated_test.go
@@ -76,7 +76,7 @@ resource "google_compute_instance_template" "foobar" {
     network = "default"
   }
 
-  metadata {
+  metadata = {
     foo = "bar"
   }
 
diff --git a/google/resource_compute_region_autoscaler_test.go b/google/resource_compute_region_autoscaler_test.go
index 282f4cca..a06c4727 100644
--- a/google/resource_compute_region_autoscaler_test.go
+++ b/google/resource_compute_region_autoscaler_test.go
@@ -154,10 +154,6 @@ resource "google_compute_instance_template" "foobar" {
 		network = "default"
 	}
 
-	metadata {
-		foo = "bar"
-	}
-
 	service_account {
 		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 	}
@@ -219,10 +215,6 @@ resource "google_compute_instance_template" "foobar" {
 		network = "default"
 	}
 
-	metadata {
-		foo = "bar"
-	}
-
 	service_account {
 		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 	}
diff --git a/google/resource_compute_region_disk_test.go b/google/resource_compute_region_disk_test.go
index 1dd60889..c92c994a 100644
--- a/google/resource_compute_region_disk_test.go
+++ b/google/resource_compute_region_disk_test.go
@@ -327,7 +327,7 @@ resource "google_compute_region_disk" "regiondisk" {
 	replica_zones = ["us-central1-a", "us-central1-f"]
 
 	size = 100
-	labels {
+	labels = {
 		my-label = "my-updated-label-value"
 		a-new-label = "a-new-label-value"
 	}
diff --git a/google/resource_compute_region_instance_group_manager_test.go b/google/resource_compute_region_instance_group_manager_test.go
index 43886aaf..cb9f5291 100644
--- a/google/resource_compute_region_instance_group_manager_test.go
+++ b/google/resource_compute_region_instance_group_manager_test.go
@@ -253,10 +253,6 @@ func testAccRegionInstanceGroupManager_basic(template, target, igm1, igm2 string
 			network = "default"
 		}
 
-		metadata {
-			foo = "bar"
-		}
-
 		service_account {
 			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 		}
@@ -312,10 +308,6 @@ func testAccRegionInstanceGroupManager_targetSizeZero(template, igm string) stri
 			network = "default"
 		}
 
-		metadata {
-			foo = "bar"
-		}
-
 		service_account {
 			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 		}
@@ -354,10 +346,6 @@ func testAccRegionInstanceGroupManager_update(template, target, igm string) stri
 			network = "default"
 		}
 
-		metadata {
-			foo = "bar"
-		}
-
 		service_account {
 			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 		}
@@ -408,10 +396,6 @@ func testAccRegionInstanceGroupManager_update2(template1, target1, target2, temp
 			network = "default"
 		}
 
-		metadata {
-			foo = "bar"
-		}
-
 		service_account {
 			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 		}
@@ -445,10 +429,6 @@ func testAccRegionInstanceGroupManager_update2(template1, target1, target2, temp
 			network = "default"
 		}
 
-		metadata {
-			foo = "bar"
-		}
-
 		service_account {
 			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 		}
@@ -543,10 +523,6 @@ func testAccRegionInstanceGroupManager_separateRegions(igm1, igm2 string) string
 			network = "default"
 		}
 
-		metadata {
-			foo = "bar"
-		}
-
 		service_account {
 			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
 		}
@@ -592,9 +568,6 @@ resource "google_compute_instance_template" "igm-basic" {
 	network_interface {
 		network = "default"
 	}
-	metadata {
-		foo = "bar"
-	}
 }
 
 resource "google_compute_region_instance_group_manager" "igm-basic" {
diff --git a/google/resource_container_cluster_test.go b/google/resource_container_cluster_test.go
index 81c58cc0..e8059e7e 100644
--- a/google/resource_container_cluster_test.go
+++ b/google/resource_container_cluster_test.go
@@ -1631,10 +1631,10 @@ resource "google_container_cluster" "with_node_config" {
 			"https://www.googleapis.com/auth/logging.write"
 		]
 		service_account = "default"
-		metadata {
+		metadata = {
 			foo = "bar"
 		}
-		labels {
+		labels = {
 			foo = "bar"
 		}
 		tags = ["foo", "bar"]
@@ -1666,10 +1666,10 @@ resource "google_container_cluster" "with_node_config" {
 			"https://www.googleapis.com/auth/logging.write"
 		]
 		service_account = "default"
-		metadata {
+		metadata = {
 			foo = "bar"
 		}
-		labels {
+		labels = {
 			foo = "bar"
 		}
 		tags = ["foo", "bar"]
@@ -1929,11 +1929,11 @@ resource "google_container_cluster" "with_node_pool_node_config" {
 				"https://www.googleapis.com/auth/monitoring"
 			]
 			service_account = "default"
-			metadata {
+			metadata = {
 				foo = "bar"
 			}
 			image_type = "COS"
-			labels {
+			labels = {
 				foo = "bar"
 			}
 			tags = ["foo", "bar"]
@@ -2134,7 +2134,7 @@ resource "google_container_cluster" "with_resource_labels" {
 	zone = "us-central1-a"
 	initial_node_count = 1
 
-	resource_labels {
+	resource_labels = {
 		created-by = "terraform"
 	}
 }
diff --git a/google/resource_dataflow_job_test.go b/google/resource_dataflow_job_test.go
index e61704ec..79fd4e90 100644
--- a/google/resource_dataflow_job_test.go
+++ b/google/resource_dataflow_job_test.go
@@ -138,7 +138,7 @@ resource "google_dataflow_job" "big_data" {
 	template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
 	temp_gcs_location = "${google_storage_bucket.temp.url}"
 
-	parameters {
+	parameters = {
 		inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
 		output    = "${google_storage_bucket.temp.url}/output"
 	}
@@ -161,7 +161,7 @@ resource "google_dataflow_job" "big_data" {
 	template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
 	temp_gcs_location = "${google_storage_bucket.temp.url}"
 
-	parameters {
+	parameters = {
 		inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
 		output    = "${google_storage_bucket.temp.url}/output"
 	}
diff --git a/google/resource_dataproc_cluster_test.go b/google/resource_dataproc_cluster_test.go
index c0c3a493..7a57c18b 100644
--- a/google/resource_dataproc_cluster_test.go
+++ b/google/resource_dataproc_cluster_test.go
@@ -796,7 +796,7 @@ resource "google_dataproc_cluster" "basic" {
 
 	cluster_config {
 		gce_cluster_config {
-			metadata {
+			metadata = {
 				foo = "bar"
 				baz = "qux"
 			}
@@ -989,7 +989,7 @@ resource "google_dataproc_cluster" "with_labels" {
 	name   = "dproc-cluster-test-%s"
 	region = "us-central1"
 
-	labels {
+	labels = {
 		key1 = "value1"
 	}
 
diff --git a/google/resource_dataproc_job_test.go b/google/resource_dataproc_job_test.go
index 4fc6b0aa..6932dc55 100644
--- a/google/resource_dataproc_job_test.go
+++ b/google/resource_dataproc_job_test.go
@@ -549,7 +549,7 @@ resource "google_dataproc_job" "pyspark" {
 			"spark.logConf" = "true"
 		}
 		logging_config {
-			driver_log_levels {
+			driver_log_levels = {
 				"root" = "INFO"
 			}
 		}
@@ -559,7 +559,7 @@ resource "google_dataproc_job" "pyspark" {
 		max_failures_per_hour = 1
 	}
 
-	labels {
+	labels = {
 		one = "1"
 	}
 }
diff --git a/google/resource_google_project_test.go b/google/resource_google_project_test.go
index 6801e0e6..67285dee 100644
--- a/google/resource_google_project_test.go
+++ b/google/resource_google_project_test.go
@@ -327,7 +327,7 @@ resource "google_project" "acceptance" {
     project_id = "%s"
     name       = "%s"
     org_id     = "%s"
-	labels {`, pid, name, org)
+	labels = {`, pid, name, org)
 
 	l := ""
 	for key, value := range labels {
diff --git a/google/resource_redis_instance_generated_test.go b/google/resource_redis_instance_generated_test.go
index 3ea2ab79..e9538fb7 100644
--- a/google/resource_redis_instance_generated_test.go
+++ b/google/resource_redis_instance_generated_test.go
@@ -91,7 +91,7 @@ resource "google_redis_instance" "cache" {
   display_name      = "Terraform Test Instance"
   reserved_ip_range = "192.168.0.0/29"
 
-  labels {
+  labels = {
     my_key    = "my_val"
     other_key = "other_val"
   }
diff --git a/google/resource_redis_instance_test.go b/google/resource_redis_instance_test.go
index be030d02..be3aeb32 100644
--- a/google/resource_redis_instance_test.go
+++ b/google/resource_redis_instance_test.go
@@ -100,7 +100,7 @@ resource "google_redis_instance" "test" {
 	memory_size_gb = 1
 	region         = "us-central1"
 
-	labels {
+	labels = {
 		my_key    = "my_val"
 		other_key = "other_val"
 	}
@@ -119,7 +119,7 @@ resource "google_redis_instance" "test" {
 	display_name   = "post-update"
 	memory_size_gb = 1
 
-	labels {
+	labels = {
 		my_key    = "my_val"
 		other_key = "new_val"
 	}
@@ -152,7 +152,7 @@ resource "google_redis_instance" "test" {
 	display_name      = "Terraform Test Instance"
 	reserved_ip_range = "192.168.0.0/29"
 
-	labels {
+	labels = {
 		my_key    = "my_val"
 		other_key = "other_val"
 	}
diff --git a/google/resource_spanner_instance_test.go b/google/resource_spanner_instance_test.go
index f26c86b2..c28e01a4 100644
--- a/google/resource_spanner_instance_test.go
+++ b/google/resource_spanner_instance_test.go
@@ -292,7 +292,7 @@ resource "google_spanner_instance" "updater" {
   display_name  = "%s"
   num_nodes     = %d
 
-  labels {
+  labels = {
      "key1" = "value1"
      %s
   }
diff --git a/google/resource_sql_database_instance_test.go b/google/resource_sql_database_instance_test.go
index 2da50af1..b750ca06 100644
--- a/google/resource_sql_database_instance_test.go
+++ b/google/resource_sql_database_instance_test.go
@@ -945,7 +945,7 @@ resource "google_sql_database_instance" "instance" {
 	region = "us-central1"
 	settings {
 		tier = "db-f1-micro"
-		user_labels {
+		user_labels = {
 		    track = "production"
 		    location = "western-division"
 		}
@@ -958,7 +958,7 @@ resource "google_sql_database_instance" "instance" {
 	region = "us-central1"
 	settings {
 		tier = "db-f1-micro"
-		user_labels {
+		user_labels = {
 		    track = "production"
 		}
 	}
diff --git a/google/resource_storage_bucket_test.go b/google/resource_storage_bucket_test.go
index 962c29ed..ed90a897 100644
--- a/google/resource_storage_bucket_test.go
+++ b/google/resource_storage_bucket_test.go
@@ -991,7 +991,7 @@ func testAccStorageBucket_labels(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
 	name = "%s"
-	labels {
+	labels = {
 		my-label = "my-label-value"
 	}
 }
@@ -1040,7 +1040,7 @@ func testAccStorageBucket_updateLabels(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
 	name = "%s"
-	labels {
+	labels = {
 		my-label    = "my-updated-label-value"
 		a-new-label = "a-new-label-value"
 	}
diff --git a/google/resource_storage_notification_test.go b/google/resource_storage_notification_test.go
index 3498b56b..badc6cfd 100644
--- a/google/resource_storage_notification_test.go
+++ b/google/resource_storage_notification_test.go
@@ -242,7 +242,7 @@ resource "google_storage_notification" "notification" {
 	payload_format    = "JSON_API_V1"
 	topic             = "${google_pubsub_topic.topic.id}"
 	event_types       = ["%s","%s"]
-	custom_attributes {
+	custom_attributes = {
 		new-attribute = "new-attribute-value"
 	}
 	depends_on        = ["google_pubsub_topic_iam_binding.binding"]
diff --git a/website/docs/d/datasource_google_service_account.html.markdown b/website/docs/d/datasource_google_service_account.html.markdown
index 36da7cd2..0a150b60 100644
--- a/website/docs/d/datasource_google_service_account.html.markdown
+++ b/website/docs/d/datasource_google_service_account.html.markdown
@@ -30,7 +30,7 @@ resource "google_service_account_key" "mykey" {
 }
 
 resource "kubernetes_secret" "google-application-credentials" {
-  metadata {
+  metadata = {
     name = "google-application-credentials"
   }
   data {
diff --git a/website/docs/d/signed_url.html.markdown b/website/docs/d/signed_url.html.markdown
index afb372b4..5c2eb10e 100644
--- a/website/docs/d/signed_url.html.markdown
+++ b/website/docs/d/signed_url.html.markdown
@@ -46,7 +46,7 @@ data "google_storage_object_signed_url" "get_url" {
   duration     = "2d"
   credentials  = "${file("path/to/credentials.json")}"
   
-  extension_headers {
+  extension_headers = {
     x-goog-if-generation-match = 1
   }
 }
diff --git a/website/docs/r/bigquery_dataset.html.markdown b/website/docs/r/bigquery_dataset.html.markdown
index 845d11c9..1fe8cebf 100644
--- a/website/docs/r/bigquery_dataset.html.markdown
+++ b/website/docs/r/bigquery_dataset.html.markdown
@@ -23,7 +23,7 @@ resource "google_bigquery_dataset" "default" {
   location                    = "EU"
   default_table_expiration_ms = 3600000
 
-  labels {
+  labels = {
     env = "default"
   }
 
diff --git a/website/docs/r/bigquery_table.html.markdown b/website/docs/r/bigquery_table.html.markdown
index f1ab1fc6..238a384f 100644
--- a/website/docs/r/bigquery_table.html.markdown
+++ b/website/docs/r/bigquery_table.html.markdown
@@ -23,7 +23,7 @@ resource "google_bigquery_dataset" "default" {
   location                    = "EU"
   default_table_expiration_ms = 3600000
 
-  labels {
+  labels = {
     env = "default"
   }
 }
@@ -36,7 +36,7 @@ resource "google_bigquery_table" "default" {
     type = "DAY"
   }
 
-  labels {
+  labels = {
     env = "default"
   }
 
diff --git a/website/docs/r/cloudfunctions_function.html.markdown b/website/docs/r/cloudfunctions_function.html.markdown
index d952d968..4d302ffa 100644
--- a/website/docs/r/cloudfunctions_function.html.markdown
+++ b/website/docs/r/cloudfunctions_function.html.markdown
@@ -35,10 +35,11 @@ resource "google_cloudfunctions_function" "function" {
   trigger_http          = true
   timeout               = 60
   entry_point           = "helloGET"
-  labels {
+  labels = {
     my-label = "my-label-value"
   }
-  environment_variables {
+  
+  environment_variables = {
     MY_ENV_VAR = "my-env-var-value"
   }
 }
diff --git a/website/docs/r/composer_environment.html.markdown b/website/docs/r/composer_environment.html.markdown
index 9277506d..9f2f98d5 100644
--- a/website/docs/r/composer_environment.html.markdown
+++ b/website/docs/r/composer_environment.html.markdown
@@ -99,16 +99,16 @@ resource "google_composer_environment" "test" {
 
   config {
     software_config {
-      airflow_config_overrides {
+      airflow_config_overrides = {
         core-load_example = "True"
       }
 
-      pypi_packages {
+      pypi_packages = {
         numpy = ""
         scipy = "==1.1.0"
       }
 
-      env_variables {
+      env_variables = {
          FOO = "bar"
       }
     }
diff --git a/website/docs/r/compute_autoscaler.html.markdown b/website/docs/r/compute_autoscaler.html.markdown
index bf084b95..67e0249d 100644
--- a/website/docs/r/compute_autoscaler.html.markdown
+++ b/website/docs/r/compute_autoscaler.html.markdown
@@ -74,7 +74,7 @@ resource "google_compute_instance_template" "foobar" {
     network = "default"
   }
 
-  metadata {
+  metadata = {
     foo = "bar"
   }
 
diff --git a/website/docs/r/compute_disk.html.markdown b/website/docs/r/compute_disk.html.markdown
index 0a8c1602..889b049a 100644
--- a/website/docs/r/compute_disk.html.markdown
+++ b/website/docs/r/compute_disk.html.markdown
@@ -63,7 +63,7 @@ resource "google_compute_disk" "default" {
   type  = "pd-ssd"
   zone  = "us-central1-a"
   image = "debian-8-jessie-v20170523"
-  labels {
+  labels = {
     environment = "dev"
   }
 }
diff --git a/website/docs/r/compute_instance.html.markdown b/website/docs/r/compute_instance.html.markdown
index cecc59bd..2a1541c0 100644
--- a/website/docs/r/compute_instance.html.markdown
+++ b/website/docs/r/compute_instance.html.markdown
@@ -42,7 +42,7 @@ resource "google_compute_instance" "default" {
     }
   }
 
-  metadata {
+  metadata = {
     foo = "bar"
   }
 
diff --git a/website/docs/r/compute_instance_from_template.html.markdown b/website/docs/r/compute_instance_from_template.html.markdown
index 15c96d38..10fba707 100644
--- a/website/docs/r/compute_instance_from_template.html.markdown
+++ b/website/docs/r/compute_instance_from_template.html.markdown
@@ -36,7 +36,7 @@ resource "google_compute_instance_template" "tpl" {
     network = "default"
   }
 
-  metadata {
+  metadata = {
     foo = "bar"
   }
 
@@ -51,7 +51,7 @@ resource "google_compute_instance_from_template" "tpl" {
 
   // Override fields from instance template
   can_ip_forward = false
-  labels {
+  labels = {
     my_key       = "my_value"
   }
 }
diff --git a/website/docs/r/compute_instance_template.html.markdown b/website/docs/r/compute_instance_template.html.markdown
index db6fe328..f4b53455 100644
--- a/website/docs/r/compute_instance_template.html.markdown
+++ b/website/docs/r/compute_instance_template.html.markdown
@@ -55,7 +55,7 @@ resource "google_compute_instance_template" "default" {
     network = "default"
   }
 
-  metadata {
+  metadata = {
     foo = "bar"
   }
 
diff --git a/website/docs/r/compute_project_metadata.html.markdown b/website/docs/r/compute_project_metadata.html.markdown
index 0fd65b31..77b74b13 100644
--- a/website/docs/r/compute_project_metadata.html.markdown
+++ b/website/docs/r/compute_project_metadata.html.markdown
@@ -22,7 +22,7 @@ key/value pairs within the project metadata rather than the entire set, then use
 
 ```hcl
 resource "google_compute_project_metadata" "default" {
-  metadata {
+  metadata = {
     foo  = "bar"
     fizz = "buzz"
     "13" = "42"
diff --git a/website/docs/r/compute_region_autoscaler.html.markdown b/website/docs/r/compute_region_autoscaler.html.markdown
index 16140ee7..b5d46a2d 100644
--- a/website/docs/r/compute_region_autoscaler.html.markdown
+++ b/website/docs/r/compute_region_autoscaler.html.markdown
@@ -74,7 +74,7 @@ resource "google_compute_instance_template" "foobar" {
     network = "default"
   }
 
-  metadata {
+  metadata = {
     foo = "bar"
   }
 
diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
index ffb67239..897f6337 100644
--- a/website/docs/r/container_cluster.html.markdown
+++ b/website/docs/r/container_cluster.html.markdown
@@ -42,7 +42,7 @@ resource "google_container_cluster" "primary" {
       "https://www.googleapis.com/auth/monitoring",
     ]
 
-    labels {
+    labels = {
       foo = "bar"
     }
 
diff --git a/website/docs/r/dataflow_job.html.markdown b/website/docs/r/dataflow_job.html.markdown
index 7543ee4f..d1bd4c0c 100644
--- a/website/docs/r/dataflow_job.html.markdown
+++ b/website/docs/r/dataflow_job.html.markdown
@@ -20,7 +20,7 @@ resource "google_dataflow_job" "big_data_job" {
     name = "dataflow-job"
     template_gcs_path = "gs://my-bucket/templates/template_file"
     temp_gcs_location = "gs://my-bucket/tmp_dir"
-    parameters {
+    parameters = {
         foo = "bar"
         baz = "qux"
     }
diff --git a/website/docs/r/dataproc_cluster.html.markdown b/website/docs/r/dataproc_cluster.html.markdown
index fafec09f..e15e1538 100644
--- a/website/docs/r/dataproc_cluster.html.markdown
+++ b/website/docs/r/dataproc_cluster.html.markdown
@@ -31,7 +31,7 @@ resource "google_dataproc_cluster" "simplecluster" {
 resource "google_dataproc_cluster" "mycluster" {
     name       = "mycluster"
     region     = "us-central1"
-    labels {
+    labels = {
         foo = "bar"
     }
 
diff --git a/website/docs/r/dataproc_job.html.markdown b/website/docs/r/dataproc_job.html.markdown
index 5ae5dc12..5768d63b 100644
--- a/website/docs/r/dataproc_job.html.markdown
+++ b/website/docs/r/dataproc_job.html.markdown
@@ -39,7 +39,7 @@ resource "google_dataproc_job" "spark" {
         }
         
         logging_config {
-            driver_log_levels {
+            driver_log_levels = {
                 "root" = "INFO"
             }
         }
@@ -166,7 +166,7 @@ resource "google_dataproc_job" "spark" {
         }
         
         logging_config {
-            driver_log_levels {
+            driver_log_levels = {
                 "root" = "INFO"
             }
         }
diff --git a/website/docs/r/google_service_account_key.html.markdown b/website/docs/r/google_service_account_key.html.markdown
index 704782b5..5d3b0003 100644
--- a/website/docs/r/google_service_account_key.html.markdown
+++ b/website/docs/r/google_service_account_key.html.markdown
@@ -38,7 +38,7 @@ resource "google_service_account_key" "mykey" {
 }
 
 resource "kubernetes_secret" "google-application-credentials" {
-  metadata {
+  metadata = {
     name = "google-application-credentials"
   }
   data {
diff --git a/website/docs/r/pubsub_subscription.html.markdown b/website/docs/r/pubsub_subscription.html.markdown
index 96d24660..94e208ee 100644
--- a/website/docs/r/pubsub_subscription.html.markdown
+++ b/website/docs/r/pubsub_subscription.html.markdown
@@ -29,7 +29,7 @@ resource "google_pubsub_subscription" "default" {
   push_config {
     push_endpoint = "https://example.com/push"
 
-    attributes {
+    attributes = {
       x-goog-version = "v1"
     }
   }
diff --git a/website/docs/r/redis_instance.html.markdown b/website/docs/r/redis_instance.html.markdown
index 2e689d7d..61c62ff1 100644
--- a/website/docs/r/redis_instance.html.markdown
+++ b/website/docs/r/redis_instance.html.markdown
@@ -67,7 +67,7 @@ resource "google_redis_instance" "cache" {
   display_name      = "Terraform Test Instance"
   reserved_ip_range = "192.168.0.0/29"
 
-  labels {
+  labels = {
     my_key    = "my_val"
     other_key = "other_val"
   }
diff --git a/website/docs/r/storage_notification.html.markdown b/website/docs/r/storage_notification.html.markdown
index 15985f29..1b1fa3a7 100644
--- a/website/docs/r/storage_notification.html.markdown
+++ b/website/docs/r/storage_notification.html.markdown
@@ -28,7 +28,7 @@ resource "google_storage_notification" "notification" {
 	payload_format    = "JSON_API_V1"
 	topic             = "${google_pubsub_topic.topic.id}"
 	event_types       = ["OBJECT_FINALIZE", "OBJECT_METADATA_UPDATE"]
-	custom_attributes {
+	custom_attributes = {
 		new-attribute = "new-attribute-value"
 	}
 	depends_on        = ["google_pubsub_topic_iam_binding.binding"]