diff --git a/third_party/terraform/tests/data_source_compute_lb_ip_ranges_test.go b/third_party/terraform/tests/data_source_compute_lb_ip_ranges_test.go
index 2bba95ed2988..8950d39b3874 100644
--- a/third_party/terraform/tests/data_source_compute_lb_ip_ranges_test.go
+++ b/third_party/terraform/tests/data_source_compute_lb_ip_ranges_test.go
@@ -30,5 +30,6 @@ func TestAccDataSourceComputeLbIpRanges_basic(t *testing.T) {
 }
 
 const testAccComputeLbIpRangesConfig = `
-data "google_compute_lb_ip_ranges" "some" {}
+data "google_compute_lb_ip_ranges" "some" {
+}
 `
diff --git a/third_party/terraform/tests/data_source_dns_managed_zone_test.go b/third_party/terraform/tests/data_source_dns_managed_zone_test.go
index b2b48ef2c760..34d014f504d6 100644
--- a/third_party/terraform/tests/data_source_dns_managed_zone_test.go
+++ b/third_party/terraform/tests/data_source_dns_managed_zone_test.go
@@ -27,13 +27,13 @@ func TestAccDataSourceDnsManagedZone_basic(t *testing.T) {
 func testAccDataSourceDnsManagedZone_basic() string {
 	return fmt.Sprintf(`
 resource "google_dns_managed_zone" "foo" {
-	name		= "qa-zone-%s"
-	dns_name	= "qa.tf-test.club."
-	description	= "QA DNS zone"
+  name        = "qa-zone-%s"
+  dns_name    = "qa.tf-test.club."
+  description = "QA DNS zone"
 }
 
 data "google_dns_managed_zone" "qa" {
-	name	= "${google_dns_managed_zone.foo.name}"
+  name = google_dns_managed_zone.foo.name
 }
 `, acctest.RandString(10))
 }
diff --git a/third_party/terraform/tests/data_source_google_active_folder_test.go b/third_party/terraform/tests/data_source_google_active_folder_test.go
index 8e18b1f2451e..b887ccbde833 100644
--- a/third_party/terraform/tests/data_source_google_active_folder_test.go
+++ b/third_party/terraform/tests/data_source_google_active_folder_test.go
@@ -82,13 +82,14 @@ func testAccDataSourceGoogleActiveFolderCheck(data_source_name string, resource_
 func testAccDataSourceGoogleActiveFolderConfig(parent string, displayName string) string {
 	return fmt.Sprintf(`
 resource "google_folder" "foobar" {
-  parent = "%s"
+  parent       = "%s"
   display_name = "%s"
 }
 
 data "google_active_folder" "my_folder" {
-  parent = "${google_folder.foobar.parent}"
-  display_name = "${google_folder.foobar.display_name}"
+  parent       = google_folder.foobar.parent
+  display_name = google_folder.foobar.display_name
 }
+
 `, parent, displayName)
 }
diff --git a/third_party/terraform/tests/resource_container_cluster_test.go.erb b/third_party/terraform/tests/resource_container_cluster_test.go.erb
index 6f687336a9f9..f4e429edcfa9 100644
--- a/third_party/terraform/tests/resource_container_cluster_test.go.erb
+++ b/third_party/terraform/tests/resource_container_cluster_test.go.erb
@@ -2097,7 +2097,7 @@ resource "google_compute_subnetwork" "container_subnetwork" {
 	name					 = "${google_compute_network.container_network.name}"
 	network					 = "${google_compute_network.container_network.name}"
 	ip_cidr_range			 = "10.0.36.0/24"
-	location				 = "us-central1"
+	region				 = "us-central1"
 	private_ip_google_access = true
 
 	secondary_ip_range {
@@ -2227,7 +2227,7 @@ resource "google_compute_network" "container_network" {
 resource "google_compute_subnetwork" "container_subnetwork" {
 	name	 = "${google_compute_network.container_network.name}"
 	network  = "${google_compute_network.container_network.name}"
-	location = "us-central1"
+	region = "us-central1"
 
 	ip_cidr_range			 = "10.0.35.0/24"
 	private_ip_google_access = true
@@ -2935,7 +2935,7 @@ resource "google_compute_subnetwork" "container_subnetwork" {
 	name		  = "${google_compute_network.container_network.name}"
 	network		  = "${google_compute_network.container_network.name}"
 	ip_cidr_range = "10.0.0.0/24"
-	location 	  = "us-central1"
+	region 	  = "us-central1"
 
 	secondary_ip_range {
 		range_name	  = "pods"
@@ -2997,7 +2997,7 @@ resource "google_compute_subnetwork" "container_subnetwork" {
 	name		  = "${google_compute_network.container_network.name}"
 	network		  = "${google_compute_network.container_network.name}"
 	ip_cidr_range = "10.0.0.0/24"
-	location	  = "us-central1"
+	region	  = "us-central1"
 }
 
 resource "google_container_cluster" "with_ip_allocation_policy" {
@@ -3126,7 +3126,7 @@ resource "google_compute_subnetwork" "container_subnetwork" {
 	name					 = "${google_compute_network.container_network.name}"
 	network					 = "${google_compute_network.container_network.name}"
 	ip_cidr_range			 = "10.0.36.0/24"
-	location				 = "us-central1"
+	region				 = "us-central1"
 	private_ip_google_access = true
 
 	secondary_ip_range {
@@ -3171,7 +3171,7 @@ resource "google_compute_subnetwork" "container_subnetwork" {
 	name					 = "${google_compute_network.container_network.name}"
 	network					 = "${google_compute_network.container_network.name}"
 	ip_cidr_range			 = "10.0.36.0/24"
-	location				 = "us-central1"
+	region				 = "us-central1"
 	private_ip_google_access = true
 
 	secondary_ip_range {
@@ -3273,7 +3273,7 @@ resource "google_compute_network" "shared_network" {
 resource "google_compute_subnetwork" "shared_subnetwork" {
 	name		  = "test-%s"
 	ip_cidr_range = "10.0.0.0/16"
-	location	  = "us-central1"
+	region	  = "us-central1"
 	network		  = "${google_compute_network.shared_network.self_link}"
 	project		  = "${google_compute_shared_vpc_host_project.host_project.project}"
 
@@ -3385,7 +3385,7 @@ resource "google_compute_subnetwork" "container_subnetwork" {
 	name					 = "${google_compute_network.container_network.name}"
 	network					 = "${google_compute_network.container_network.name}"
 	ip_cidr_range			 = "10.0.35.0/24"
-	location				 = "us-central1"
+	region				 = "us-central1"
 	private_ip_google_access = true
 
 	secondary_ip_range {
@@ -3523,45 +3523,47 @@ resource "google_container_cluster" "with_database_encryption" {
 func testAccContainerCluster_withMasterAuthorizedNetworksDisabled(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "container_network" {
-	name = "container-net-%s"
-	auto_create_subnetworks = false
+  name                    = "container-net-%s"
+  auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "container_subnetwork" {
-	name					 = "${google_compute_network.container_network.name}"
-	network					 = "${google_compute_network.container_network.name}"
-	ip_cidr_range			 = "10.0.36.0/24"
-	location				 = "us-central1"
-	private_ip_google_access = true
-
-	secondary_ip_range {
-		range_name	  = "pod"
-		ip_cidr_range = "10.0.0.0/19"
-	}
+  name                     = google_compute_network.container_network.name
+  network                  = google_compute_network.container_network.name
+  ip_cidr_range            = "10.0.36.0/24"
+  region                   = "us-central1"
+  private_ip_google_access = true
+
+  secondary_ip_range {
+    range_name    = "pod"
+    ip_cidr_range = "10.0.0.0/19"
+  }
 
-	secondary_ip_range {
-		range_name	  = "svc"
-		ip_cidr_range = "10.0.32.0/22"
-	}
+  secondary_ip_range {
+    range_name    = "svc"
+    ip_cidr_range = "10.0.32.0/22"
+  }
 }
 
 resource "google_container_cluster" "with_private_cluster" {
-	name     = "cluster-test-%s"
-	location = "us-central1-a"
-	initial_node_count = 1
+  name               = "cluster-test-%s"
+  location           = "us-central1-a"
+  initial_node_count = 1
 
-	network = "${google_compute_network.container_network.name}"
-	subnetwork = "${google_compute_subnetwork.container_subnetwork.name}"
+  network    = google_compute_network.container_network.name
+  subnetwork = google_compute_subnetwork.container_subnetwork.name
 
-	private_cluster_config {
-		enable_private_endpoint = false
-		enable_private_nodes = true
-		master_ipv4_cidr_block = "10.42.0.0/28"
-	}
+  private_cluster_config {
+    enable_private_endpoint = false
+    enable_private_nodes    = true
+    master_ipv4_cidr_block  = "10.42.0.0/28"
+  }
 
-	ip_allocation_policy {
-		cluster_secondary_range_name  = "${google_compute_subnetwork.container_subnetwork.secondary_ip_range.0.range_name}"
-		services_secondary_range_name = "${google_compute_subnetwork.container_subnetwork.secondary_ip_range.1.range_name}"
-	}
-}`, clusterName, clusterName)
+  ip_allocation_policy {
+    cluster_secondary_range_name  = google_compute_subnetwork.container_subnetwork.secondary_ip_range[0].range_name
+    services_secondary_range_name = google_compute_subnetwork.container_subnetwork.secondary_ip_range[1].range_name
+  }
+}
+
+`, clusterName, clusterName)
 }
diff --git a/third_party/terraform/website/docs/d/datasource_client_config.html.markdown b/third_party/terraform/website/docs/d/datasource_client_config.html.markdown
index 2627a0f86807..4c570679a357 100644
--- a/third_party/terraform/website/docs/d/datasource_client_config.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_client_config.html.markdown
@@ -14,29 +14,33 @@ Use this data source to access the configuration of the Google Cloud provider.
 ## Example Usage
 
 ```tf
-data "google_client_config" "current" {}
+data "google_client_config" "current" {
+}
 
 output "project" {
-  value = "${data.google_client_config.current.project}"
+  value = data.google_client_config.current.project
 }
 ```
 
 ## Example Usage: Configure Kubernetes provider with OAuth2 access token
 
 ```tf
-data "google_client_config" "default" {}
+data "google_client_config" "default" {
+}
 
 data "google_container_cluster" "my_cluster" {
-  name   = "my-cluster"
-  zone   = "us-east1-a"
+  name = "my-cluster"
+  zone = "us-east1-a"
 }
 
 provider "kubernetes" {
   load_config_file = false
 
-  host = "https://${data.google_container_cluster.my_cluster.endpoint}"
-  token = "${data.google_client_config.default.access_token}"
-  cluster_ca_certificate = "${base64decode(data.google_container_cluster.my_cluster.master_auth.0.cluster_ca_certificate)}"
+  host  = "https://${data.google_container_cluster.my_cluster.endpoint}"
+  token = data.google_client_config.default.access_token
+  cluster_ca_certificate = base64decode(
+    data.google_container_cluster.my_cluster.master_auth[0].cluster_ca_certificate,
+  )
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/datasource_compute_address.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_address.html.markdown
index 91eec27df68d..656b71cb4b64 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_address.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_address.html.markdown
@@ -24,9 +24,9 @@ resource "google_dns_record_set" "frontend" {
   type = "A"
   ttl  = 300
 
-  managed_zone = "${google_dns_managed_zone.prod.name}"
+  managed_zone = google_dns_managed_zone.prod.name
 
-  rrdatas = ["${data.google_compute_address.my_address.address}"]
+  rrdatas = [data.google_compute_address.my_address.address]
 }
 
 resource "google_dns_managed_zone" "prod" {
diff --git a/third_party/terraform/website/docs/d/datasource_compute_global_address.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_global_address.html.markdown
index d985e2fe9cb7..4f238efe6039 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_global_address.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_global_address.html.markdown
@@ -24,9 +24,9 @@ resource "google_dns_record_set" "frontend" {
   type = "A"
   ttl  = 300
 
-  managed_zone = "${google_dns_managed_zone.prod.name}"
+  managed_zone = google_dns_managed_zone.prod.name
 
-  rrdatas = ["${data.google_compute_global_address.my_address.address}"]
+  rrdatas = [data.google_compute_global_address.my_address.address]
 }
 
 resource "google_dns_managed_zone" "prod" {
diff --git a/third_party/terraform/website/docs/d/datasource_compute_image.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_image.html.markdown
index 53597c27c49b..f30e03f6ecce 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_image.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_image.html.markdown
@@ -25,7 +25,7 @@ resource "google_compute_instance" "default" {
 
   boot_disk {
     initialize_params {
-      image = "${data.google_compute_image.my_image.self_link}"
+      image = data.google_compute_image.my_image.self_link
     }
   }
 }
diff --git a/third_party/terraform/website/docs/d/datasource_compute_instance.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_instance.html.markdown
index 40ae8bd983fe..45898b94404d 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_instance.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_instance.html.markdown
@@ -19,8 +19,8 @@ and
 
 ```hcl
 data "google_compute_instance" "appserver" {
-	name = "primary-application-server"
-	zone = "us-central1-a"
+  name = "primary-application-server"
+  zone = "us-central1-a"
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/datasource_compute_lb_ip_ranges.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_lb_ip_ranges.html.markdown
index cce7318e0207..a2c52ccc4e65 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_lb_ip_ranges.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_lb_ip_ranges.html.markdown
@@ -16,20 +16,21 @@ https://cloud.google.com/compute/docs/load-balancing/health-checks#health_check_
 ## Example Usage
 
 ```tf
-data "google_compute_lb_ip_ranges" "ranges" {}
+data "google_compute_lb_ip_ranges" "ranges" {
+}
 
 resource "google_compute_firewall" "lb" {
   name    = "lb-firewall"
-  network = "${google_compute_network.main.name}"
+  network = google_compute_network.main.name
 
   allow {
     protocol = "tcp"
     ports    = ["80"]
   }
 
-  source_ranges = ["${data.google_compute_lb_ip_ranges.ranges.network}"]
+  source_ranges = data.google_compute_lb_ip_ranges.ranges.network
   target_tags = [
-    "InstanceBehindLoadBalancer"
+    "InstanceBehindLoadBalancer",
   ]
 }
 ```
diff --git a/third_party/terraform/website/docs/d/datasource_compute_region_instance_group.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_region_instance_group.html.markdown
index 592c220da5c7..19b0090452f4 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_region_instance_group.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_region_instance_group.html.markdown
@@ -12,29 +12,28 @@ description: |-
 Get a Compute Region Instance Group within GCE.
 For more information, see [the official documentation](https://cloud.google.com/compute/docs/instance-groups/distributing-instances-with-regional-instance-groups) and [API](https://cloud.google.com/compute/docs/reference/latest/regionInstanceGroups).
 
-```
+```hcl
 data "google_compute_region_instance_group" "group" {
-	name = "instance-group-name"
+  name = "instance-group-name"
 }
 ```
 
 The most common use of this datasource will be to fetch information about the instances inside regional managed instance groups, for instance:
 
-```
+```hcl
 resource "google_compute_region_instance_group_manager" "foo" {
-	name = "some_name"
+  name               = "some_name"
     ...
-	base_instance_name = "foo"
+  base_instance_name = "foo"
     ...
-	instance_template = "${google_compute_instance_template.foo.self_link}"
-	target_pools = ["${google_compute_target_pool.foo.self_link}"]
+  instance_template  = google_compute_instance_template.foo.self_link
+  target_pools = [google_compute_target_pool.foo.self_link]
     ...
 }
 
 data "google_compute_region_instance_group" "data_source" {
-	self_link = "${google_compute_region_instance_group_manager.foo.instance_group}"
+  self_link = google_compute_region_instance_group_manager.foo.instance_group
 }
-
 ```
 
 ## Argument Reference
diff --git a/third_party/terraform/website/docs/d/datasource_compute_ssl_certificate.html.markdown b/third_party/terraform/website/docs/d/datasource_compute_ssl_certificate.html.markdown
index deddd521f72e..daa3d6c7d4ac 100644
--- a/third_party/terraform/website/docs/d/datasource_compute_ssl_certificate.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_compute_ssl_certificate.html.markdown
@@ -15,19 +15,19 @@ Get info about a Google Compute SSL Certificate from its name.
 
 ```tf
 data "google_compute_ssl_certificate" "my_cert" {
-  name       = "my-cert"
+  name = "my-cert"
 }
 
 output "certificate" {
-  value = "${data.google_compute_ssl_certificate.my_cert.certificate}"
+  value = data.google_compute_ssl_certificate.my_cert.certificate
 }
 
 output "certificate_id" {
-  value = "${data.google_compute_ssl_certificate.my_cert.certificate_id}"
+  value = data.google_compute_ssl_certificate.my_cert.certificate_id
 }
 
 output "self_link" {
-  value = "${data.google_compute_ssl_certificate.my_cert.self_link}"
+  value = data.google_compute_ssl_certificate.my_cert.self_link
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/datasource_google_client_openid_userinfo.html.markdown b/third_party/terraform/website/docs/d/datasource_google_client_openid_userinfo.html.markdown
index b9bef8574e60..5a4dcd3068ec 100644
--- a/third_party/terraform/website/docs/d/datasource_google_client_openid_userinfo.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_client_openid_userinfo.html.markdown
@@ -24,31 +24,36 @@ receive an error otherwise.
 ## Example Usage - exporting an email
 
 ```hcl
-data "google_client_openid_userinfo" "me" {}
+data "google_client_openid_userinfo" "me" {
+}
 
 output "my-email" {
-  value = "${data.google_client_openid_userinfo.me.email}"
+  value = data.google_client_openid_userinfo.me.email
 }
 ```
 
 ## Example Usage - OpenID Connect w/ Kubernetes provider + RBAC IAM role
 
 ```hcl
-data "google_client_openid_userinfo" "provider_identity" {}
+data "google_client_openid_userinfo" "provider_identity" {
+}
 
-data "google_client_config" "provider" {}
+data "google_client_config" "provider" {
+}
 
 data "google_container_cluster" "my_cluster" {
-  name   = "my-cluster"
-  zone   = "us-east1-a"
+  name = "my-cluster"
+  zone = "us-east1-a"
 }
 
 provider "kubernetes" {
   load_config_file = false
 
-  host = "https://${data.google_container_cluster.my_cluster.endpoint}"
-  token = "${data.google_client_config.provider.access_token}"
-  cluster_ca_certificate = "${base64decode(data.google_container_cluster.my_cluster.master_auth.0.cluster_ca_certificate)}"
+  host  = "https://${data.google_container_cluster.my_cluster.endpoint}"
+  token = data.google_client_config.provider.access_token
+  cluster_ca_certificate = base64decode(
+    data.google_container_cluster.my_cluster.master_auth[0].cluster_ca_certificate,
+  )
 }
 
 resource "kubernetes_cluster_role_binding" "user" {
@@ -64,7 +69,7 @@ resource "kubernetes_cluster_role_binding" "user" {
 
   subject {
     kind = "User"
-    name = "${data.google_client_openid_userinfo.provider_identity.email}"
+    name = data.google_client_openid_userinfo.provider_identity.email
   }
 }
 ```
diff --git a/third_party/terraform/website/docs/d/datasource_google_composer_image_versions.html.markdown b/third_party/terraform/website/docs/d/datasource_google_composer_image_versions.html.markdown
index a1bfec475b06..ac07c9d81251 100644
--- a/third_party/terraform/website/docs/d/datasource_google_composer_image_versions.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_composer_image_versions.html.markdown
@@ -18,11 +18,11 @@ data "google_composer_image_versions" "all" {
 }
 
 resource "google_composer_environment" "test" {
-  name           = "test-env"
-  region         = "us-central1"
+  name   = "test-env"
+  region = "us-central1"
   config {
     software_config {
-      image_version  = "${data.google_composer_image_versions.all.image_versions.0.image_version_id}"
+      image_version = data.google_composer_image_versions.all.image_versions[0].image_version_id
     }
   }
 }
diff --git a/third_party/terraform/website/docs/d/datasource_google_compute_backend_service.html.markdown b/third_party/terraform/website/docs/d/datasource_google_compute_backend_service.html.markdown
index 1bb0f3d8d582..21f7d69df7f0 100644
--- a/third_party/terraform/website/docs/d/datasource_google_compute_backend_service.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_compute_backend_service.html.markdown
@@ -22,7 +22,7 @@ data "google_compute_backend_service" "baz" {
 
 resource "google_compute_backend_service" "default" {
   name          = "backend-service"
-  health_checks = ["${tolist(data.google_compute_backend_service.baz.health_checks)[0]}"]
+  health_checks = [tolist(data.google_compute_backend_service.baz.health_checks)[0]]
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/datasource_google_compute_network_endpoint_group.html.markdown b/third_party/terraform/website/docs/d/datasource_google_compute_network_endpoint_group.html.markdown
index f9e89e12691a..8aedcf36b0d0 100644
--- a/third_party/terraform/website/docs/d/datasource_google_compute_network_endpoint_group.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_compute_network_endpoint_group.html.markdown
@@ -17,12 +17,12 @@ The NEG may be found by providing either a `self_link`, or a `name` and a `zone`
 
 ```hcl
 data "google_compute_network_endpoint_group" "neg1" {
-	name = "k8s1-abcdef01-myns-mysvc-8080-4b6bac43"
-	zone = "us-central1-a"
+  name = "k8s1-abcdef01-myns-mysvc-8080-4b6bac43"
+  zone = "us-central1-a"
 }
 
 data "google_compute_network_endpoint_group" "neg2" {
-	self_link = "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/networkEndpointGroups/k8s1-abcdef01-myns-mysvc-8080-4b6bac43"
+  self_link = "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/networkEndpointGroups/k8s1-abcdef01-myns-mysvc-8080-4b6bac43"
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/datasource_google_folder_organization_policy.html.markdown b/third_party/terraform/website/docs/d/datasource_google_folder_organization_policy.html.markdown
index e1e18b801b44..c3e88de7132e 100644
--- a/third_party/terraform/website/docs/d/datasource_google_folder_organization_policy.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_folder_organization_policy.html.markdown
@@ -22,7 +22,7 @@ data "google_folder_organization_policy" "policy" {
 }
 
 output "version" {
-  value = "${data.google_folder_organization_policy.policy.version}"
+  value = data.google_folder_organization_policy.policy.version
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/datasource_google_iam_role.html.markdown b/third_party/terraform/website/docs/d/datasource_google_iam_role.html.markdown
index a438b8eef362..c4e178290def 100644
--- a/third_party/terraform/website/docs/d/datasource_google_iam_role.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_iam_role.html.markdown
@@ -17,9 +17,8 @@ data "google_iam_role" "roleinfo" {
 }
 
 output "the_role_permissions" {
-  value = "${data.google_iam_role.roleinfo.included_permissions}"
+  value = data.google_iam_role.roleinfo.included_permissions
 }
-
 ```
 
 ## Argument Reference
diff --git a/third_party/terraform/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown b/third_party/terraform/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown
index 95d0b1874076..219e2b38a8de 100644
--- a/third_party/terraform/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown
@@ -14,18 +14,19 @@ Use this data source to get the IP addresses from different special IP ranges on
 ## Example Usage - Cloud Ranges
 
 ```tf
-data "google_netblock_ip_ranges" "netblock" {}
+data "google_netblock_ip_ranges" "netblock" {
+}
 
 output "cidr_blocks" {
-  value = "${data.google_netblock_ip_ranges.netblock.cidr_blocks}"
+  value = data.google_netblock_ip_ranges.netblock.cidr_blocks
 }
 
 output "cidr_blocks_ipv4" {
-  value = "${data.google_netblock_ip_ranges.netblock.cidr_blocks_ipv4}"
+  value = data.google_netblock_ip_ranges.netblock.cidr_blocks_ipv4
 }
 
 output "cidr_blocks_ipv6" {
-  value = "${data.google_netblock_ip_ranges.netblock.cidr_blocks_ipv6}"
+  value = data.google_netblock_ip_ranges.netblock.cidr_blocks_ipv6
 }
 ```
 
@@ -38,14 +39,14 @@ data "google_netblock_ip_ranges" "legacy-hcs" {
 
 resource "google_compute_firewall" "allow-hcs" {
   name    = "allow-hcs"
-  network = "${google_compute_network.default.name}"
+  network = google_compute_network.default.name
 
   allow {
     protocol = "tcp"
     ports    = ["80"]
   }
 
-  source_ranges = ["${data.google_netblock_ip_ranges.legacy-hcs.cidr_blocks_ipv4}"]
+  source_ranges = data.google_netblock_ip_ranges.legacy-hcs.cidr_blocks_ipv4
 }
 
 resource "google_compute_network" "default" {
diff --git a/third_party/terraform/website/docs/d/datasource_google_project_organization_policy.html.markdown b/third_party/terraform/website/docs/d/datasource_google_project_organization_policy.html.markdown
index 0e4a697c0fe5..ee6e7b01830f 100644
--- a/third_party/terraform/website/docs/d/datasource_google_project_organization_policy.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_project_organization_policy.html.markdown
@@ -22,7 +22,7 @@ data "google_project_organization_policy" "policy" {
 }
 
 output "version" {
-  value = "${data.google_project_organization_policy.policy.version}"
+  value = data.google_project_organization_policy.policy.version
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/datasource_google_service_account.html.markdown b/third_party/terraform/website/docs/d/datasource_google_service_account.html.markdown
index cc38459c2a38..1f319ea3f7b3 100644
--- a/third_party/terraform/website/docs/d/datasource_google_service_account.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_service_account.html.markdown
@@ -27,15 +27,15 @@ data "google_service_account" "myaccount" {
 }
 
 resource "google_service_account_key" "mykey" {
-  service_account_id = "${data.google_service_account.myaccount.name}"
+  service_account_id = data.google_service_account.myaccount.name
 }
 
 resource "kubernetes_secret" "google-application-credentials" {
-  metadata = {
+  metadata {
     name = "google-application-credentials"
   }
-  data {
-    credentials.json = "${base64decode(google_service_account_key.mykey.private_key)}"
+  data = {
+    credentials.json = base64decode(google_service_account_key.mykey.private_key)
   }
 }
 ```
diff --git a/third_party/terraform/website/docs/d/datasource_google_service_account_access_token.html.markdown b/third_party/terraform/website/docs/d/datasource_google_service_account_access_token.html.markdown
index 476c14ffc265..c18d6b154b6d 100644
--- a/third_party/terraform/website/docs/d/datasource_google_service_account_access_token.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_service_account_access_token.html.markdown
@@ -35,30 +35,31 @@ Once the IAM permissions are set, you can apply the new token to a provider boot
 In the example below, `google_project` will run as `service_B`.
 
 ```hcl
-provider "google" {}
+provider "google" {
+}
 
 data "google_client_config" "default" {
-  provider = "google"
+  provider = google
 }
 
 data "google_service_account_access_token" "default" {
- provider = "google"
- target_service_account = "service_B@projectB.iam.gserviceaccount.com"
- scopes = ["userinfo-email", "cloud-platform"]
- lifetime = "300s"
+  provider               = google
+  target_service_account = "service_B@projectB.iam.gserviceaccount.com"
+  scopes                 = ["userinfo-email", "cloud-platform"]
+  lifetime               = "300s"
 }
 
 provider "google" {
-   alias  = "impersonated"
-   access_token = "${data.google_service_account_access_token.default.access_token}"
+  alias        = "impersonated"
+  access_token = data.google_service_account_access_token.default.access_token
 }
 
 data "google_client_openid_userinfo" "me" {
-  provider = "google.impersonated"
+  provider = google.impersonated
 }
 
 output "target-email" {
-  value = "${data.google_client_openid_userinfo.me.email}"
+  value = data.google_client_openid_userinfo.me.email
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/datasource_google_service_account_key.html.markdown b/third_party/terraform/website/docs/d/datasource_google_service_account_key.html.markdown
index 69c194152d61..69a2201b9a04 100644
--- a/third_party/terraform/website/docs/d/datasource_google_service_account_key.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_google_service_account_key.html.markdown
@@ -20,11 +20,11 @@ resource "google_service_account" "myaccount" {
 }
 
 resource "google_service_account_key" "mykey" {
-  service_account_id = "${google_service_account.myaccount.name}"
+  service_account_id = google_service_account.myaccount.name
 }
 
 data "google_service_account_key" "mykey" {
-  name = "${google_service_account_key.mykey.name}"
+  name            = google_service_account_key.mykey.name
   public_key_type = "TYPE_X509_PEM_FILE"
 }
 ```
diff --git a/third_party/terraform/website/docs/d/datasource_tpu_tensorflow_versions.html.markdown b/third_party/terraform/website/docs/d/datasource_tpu_tensorflow_versions.html.markdown
index 7d809c68ada0..3f24fc6e358e 100644
--- a/third_party/terraform/website/docs/d/datasource_tpu_tensorflow_versions.html.markdown
+++ b/third_party/terraform/website/docs/d/datasource_tpu_tensorflow_versions.html.markdown
@@ -14,21 +14,23 @@ Get TensorFlow versions available for a project. For more information see the [o
 ## Example Usage
 
 ```hcl
-data "google_tpu_tensorflow_versions" "available" { }
+data "google_tpu_tensorflow_versions" "available" {
+}
 ```
 
 ## Example Usage: Configure Basic TPU Node with available version
 
 ```hcl
-data "google_tpu_tensorflow_versions" "available" { }
+data "google_tpu_tensorflow_versions" "available" {
+}
 
 resource "google_tpu_node" "tpu" {
-	name           = "test-tpu"
-	zone           = "us-central1-b"
+  name = "test-tpu"
+  zone = "us-central1-b"
 
-	accelerator_type   = "v3-8"
-	tensorflow_version = "${data.google_tpu_tensorflow_versions.available.versions[0]}"
-	cidr_block         = "10.2.0.0/29"
+  accelerator_type   = "v3-8"
+  tensorflow_version = data.google_tpu_tensorflow_versions.available.versions[0]
+  cidr_block         = "10.2.0.0/29"
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/dns_managed_zone.html.markdown b/third_party/terraform/website/docs/d/dns_managed_zone.html.markdown
index 8cef82a1f6b3..3d2403963b80 100644
--- a/third_party/terraform/website/docs/d/dns_managed_zone.html.markdown
+++ b/third_party/terraform/website/docs/d/dns_managed_zone.html.markdown
@@ -17,7 +17,7 @@ and
 
 ```hcl
 data "google_dns_managed_zone" "env_dns_zone" {
-  name        = "qa-zone"
+  name = "qa-zone"
 }
 
 resource "google_dns_record_set" "dns" {
@@ -25,7 +25,7 @@ resource "google_dns_record_set" "dns" {
   type = "TXT"
   ttl  = 300
 
-  managed_zone = "${data.google_dns_managed_zone.env_dns_zone.name}"
+  managed_zone = data.google_dns_managed_zone.env_dns_zone.name
 
   rrdatas = ["test"]
 }
diff --git a/third_party/terraform/website/docs/d/google_active_folder.html.markdown b/third_party/terraform/website/docs/d/google_active_folder.html.markdown
index 1caca3e4257a..9053e831fb99 100644
--- a/third_party/terraform/website/docs/d/google_active_folder.html.markdown
+++ b/third_party/terraform/website/docs/d/google_active_folder.html.markdown
@@ -16,7 +16,7 @@ Get an active folder within GCP by `display_name` and `parent`.
 ```tf
 data "google_active_folder" "department1" {
   display_name = "Department 1"
-  parent = "organizations/1234567"
+  parent       = "organizations/1234567"
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/google_billing_account.html.markdown b/third_party/terraform/website/docs/d/google_billing_account.html.markdown
index a03e0df8ed90..84d8c8b1e19b 100644
--- a/third_party/terraform/website/docs/d/google_billing_account.html.markdown
+++ b/third_party/terraform/website/docs/d/google_billing_account.html.markdown
@@ -22,7 +22,7 @@ resource "google_project" "my_project" {
   project_id = "your-project-id"
   org_id     = "1234567"
 
-  billing_account = "${data.google_billing_account.acct.id}"
+  billing_account = data.google_billing_account.acct.id
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/google_compute_default_service_account.html.markdown b/third_party/terraform/website/docs/d/google_compute_default_service_account.html.markdown
index 7e50711381d5..8bc330a41b83 100644
--- a/third_party/terraform/website/docs/d/google_compute_default_service_account.html.markdown
+++ b/third_party/terraform/website/docs/d/google_compute_default_service_account.html.markdown
@@ -14,11 +14,12 @@ Use this data source to retrieve default service account for this project
 ## Example Usage
 
 ```hcl
-data "google_compute_default_service_account" "default" { }
+data "google_compute_default_service_account" "default" {
+}
 
 output "default_account" {
-  value = "${data.google_compute_default_service_account.default.email}"
-} 
+  value = data.google_compute_default_service_account.default.email
+}
 ```
 
 ## Argument Reference
diff --git a/third_party/terraform/website/docs/d/google_compute_node_types.html.markdown b/third_party/terraform/website/docs/d/google_compute_node_types.html.markdown
index 0ddde6457343..5a7d8299ce42 100644
--- a/third_party/terraform/website/docs/d/google_compute_node_types.html.markdown
+++ b/third_party/terraform/website/docs/d/google_compute_node_types.html.markdown
@@ -23,7 +23,7 @@ data "google_compute_node_types" "central1b" {
 resource "google_compute_node_template" "tmpl" {
   name      = "terraform-test-tmpl"
   region    = "us-central1"
-  node_type = "${data.google_compute_node_types.types.names[0]}"
+  node_type = data.google_compute_node_types.types.names[0]
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/google_compute_regions.html.markdown b/third_party/terraform/website/docs/d/google_compute_regions.html.markdown
index 1df2c2bd8c6d..468cfd8206b3 100644
--- a/third_party/terraform/website/docs/d/google_compute_regions.html.markdown
+++ b/third_party/terraform/website/docs/d/google_compute_regions.html.markdown
@@ -12,15 +12,16 @@ description: |-
 Provides access to available Google Compute regions for a given project.
 See more about [regions and regions](https://cloud.google.com/compute/docs/regions-zones/) in the upstream docs.
 
-```
-data "google_compute_regions" "available" {}
+```hcl
+data "google_compute_regions" "available" {
+}
 
 resource "google_compute_subnetwork" "cluster" {
-  count = "${length(data.google_compute_regions.available.names)}"
+  count         = length(data.google_compute_regions.available.names)
   name          = "my-network"
   ip_cidr_range = "10.36.${count.index}.0/24"
   network       = "my-network"
-  region        = "${data.google_compute_regions.available.names[count.index]}"
+  region        = data.google_compute_regions.available.names[count.index]
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/google_compute_resource_policy.html.markdown b/third_party/terraform/website/docs/d/google_compute_resource_policy.html.markdown
index efaf97160418..d91f671bfa75 100644
--- a/third_party/terraform/website/docs/d/google_compute_resource_policy.html.markdown
+++ b/third_party/terraform/website/docs/d/google_compute_resource_policy.html.markdown
@@ -21,7 +21,7 @@ provider "google-beta" {
 }
 
 data "google_compute_resource_policy" "daily" {
-  provider = "google-beta"
+  provider = google-beta
   name     = "daily"
   region   = "us-central1"
 }
diff --git a/third_party/terraform/website/docs/d/google_compute_zones.html.markdown b/third_party/terraform/website/docs/d/google_compute_zones.html.markdown
index 604377b6aca9..cf6d3bc47c66 100644
--- a/third_party/terraform/website/docs/d/google_compute_zones.html.markdown
+++ b/third_party/terraform/website/docs/d/google_compute_zones.html.markdown
@@ -12,16 +12,17 @@ description: |-
 Provides access to available Google Compute zones in a region for a given project.
 See more about [regions and zones](https://cloud.google.com/compute/docs/regions-zones/regions-zones) in the upstream docs.
 
-```
-data "google_compute_zones" "available" {}
+```hcl
+data "google_compute_zones" "available" {
+}
 
 resource "google_compute_instance_group_manager" "foo" {
-  count = "${length(data.google_compute_zones.available.names)}"
+  count = length(data.google_compute_zones.available.names)
 
   name               = "terraform-test-${count.index}"
-  instance_template  = "${google_compute_instance_template.foobar.self_link}"
+  instance_template  = google_compute_instance_template.foobar.self_link
   base_instance_name = "foobar-${count.index}"
-  zone               = "${data.google_compute_zones.available.names[count.index]}"
+  zone               = data.google_compute_zones.available.names[count.index]
   target_size        = 1
 }
 ```
diff --git a/third_party/terraform/website/docs/d/google_container_cluster.html.markdown b/third_party/terraform/website/docs/d/google_container_cluster.html.markdown
index 67aba024ce49..c03e9341260e 100644
--- a/third_party/terraform/website/docs/d/google_container_cluster.html.markdown
+++ b/third_party/terraform/website/docs/d/google_container_cluster.html.markdown
@@ -15,32 +15,32 @@ Get info about a GKE cluster from its name and location.
 
 ```tf
 data "google_container_cluster" "my_cluster" {
-  name       = "my-cluster"
-  location   = "us-east1-a"
+  name     = "my-cluster"
+  location = "us-east1-a"
 }
 
 output "cluster_username" {
-  value = "${data.google_container_cluster.my_cluster.master_auth.0.username}"
+  value = data.google_container_cluster.my_cluster.master_auth[0].username
 }
 
 output "cluster_password" {
-  value = "${data.google_container_cluster.my_cluster.master_auth.0.password}"
+  value = data.google_container_cluster.my_cluster.master_auth[0].password
 }
 
 output "endpoint" {
-  value = "${data.google_container_cluster.my_cluster.endpoint}"
+  value = data.google_container_cluster.my_cluster.endpoint
 }
 
 output "instance_group_urls" {
-  value = "${data.google_container_cluster.my_cluster.instance_group_urls}"
+  value = data.google_container_cluster.my_cluster.instance_group_urls
 }
 
 output "node_config" {
-  value = "${data.google_container_cluster.my_cluster.node_config}"
+  value = data.google_container_cluster.my_cluster.node_config
 }
 
 output "node_pools" {
-  value = "${data.google_container_cluster.my_cluster.node_pool}"
+  value = data.google_container_cluster.my_cluster.node_pool
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/google_container_engine_versions.html.markdown b/third_party/terraform/website/docs/d/google_container_engine_versions.html.markdown
index 3c36eabb9ebe..d6b6ce23a780 100644
--- a/third_party/terraform/website/docs/d/google_container_engine_versions.html.markdown
+++ b/third_party/terraform/website/docs/d/google_container_engine_versions.html.markdown
@@ -21,14 +21,14 @@ support the same version.
 
 ```hcl
 data "google_container_engine_versions" "central1b" {
-  location           = "us-central1-b"
+  location       = "us-central1-b"
   version_prefix = "1.12."
 }
 
 resource "google_container_cluster" "foo" {
   name               = "terraform-test-cluster"
-  location               = "us-central1-b"
-  node_version       = "${data.google_container_engine_versions.central1b.latest_node_version}"
+  location           = "us-central1-b"
+  node_version       = data.google_container_engine_versions.central1b.latest_node_version
   initial_node_count = 1
 
   master_auth {
diff --git a/third_party/terraform/website/docs/d/google_container_registry_image.html.markdown b/third_party/terraform/website/docs/d/google_container_registry_image.html.markdown
index 8d7ae054a822..799646d76cd3 100644
--- a/third_party/terraform/website/docs/d/google_container_registry_image.html.markdown
+++ b/third_party/terraform/website/docs/d/google_container_registry_image.html.markdown
@@ -17,11 +17,11 @@ The URLs are computed entirely offline - as long as the project exists, they wil
 
 ```hcl
 data "google_container_registry_image" "debian" {
-    name = "debian"
+  name = "debian"
 }
 
 output "gcr_location" {
-    value = "${data.google_container_registry_image.debian.image_url}"
+  value = data.google_container_registry_image.debian.image_url
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/google_container_registry_repository.html.markdown b/third_party/terraform/website/docs/d/google_container_registry_repository.html.markdown
index 9880cc4b1b9a..3fabcaa37382 100644
--- a/third_party/terraform/website/docs/d/google_container_registry_repository.html.markdown
+++ b/third_party/terraform/website/docs/d/google_container_registry_repository.html.markdown
@@ -16,10 +16,11 @@ The URLs are computed entirely offline - as long as the project exists, they wil
 ## Example Usage
 
 ```hcl
-data "google_container_registry_repository" "foo" {}
+data "google_container_registry_repository" "foo" {
+}
 
 output "gcr_location" {
-    value = "${data.google_container_registry_repository.foo.repository_url}"
+  value = data.google_container_registry_repository.foo.repository_url
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/google_folder.html.markdown b/third_party/terraform/website/docs/d/google_folder.html.markdown
index c35afb99a248..51ed1c50f1c8 100644
--- a/third_party/terraform/website/docs/d/google_folder.html.markdown
+++ b/third_party/terraform/website/docs/d/google_folder.html.markdown
@@ -14,7 +14,7 @@ Use this data source to get information about a Google Cloud Folder.
 ```hcl
 # Get folder by id
 data "google_folder" "my_folder_1" {
-  folder = "folders/12345"
+  folder              = "folders/12345"
   lookup_organization = true
 }
 
@@ -24,13 +24,12 @@ data "google_folder" "my_folder_2" {
 }
 
 output "my_folder_1_organization" {
-  value = "${data.google_folder.my_folder_1.organization}"
+  value = data.google_folder.my_folder_1.organization
 }
 
 output "my_folder_2_parent" {
-  value = "${data.google_folder.my_folder_2.parent}"
+  value = data.google_folder.my_folder_2.parent
 }
-
 ```
 
 ## Argument Reference
diff --git a/third_party/terraform/website/docs/d/google_kms_crypto_key.html.markdown b/third_party/terraform/website/docs/d/google_kms_crypto_key.html.markdown
index 82a861692efc..cc91bd9fc5f8 100644
--- a/third_party/terraform/website/docs/d/google_kms_crypto_key.html.markdown
+++ b/third_party/terraform/website/docs/d/google_kms_crypto_key.html.markdown
@@ -26,8 +26,8 @@ data "google_kms_key_ring" "my_key_ring" {
 }
 
 data "google_kms_crypto_key" "my_crypto_key" {
-  name            = "my-crypto-key"
-  key_ring        = "${data.google_kms_key_ring.my_key_ring.self_link}"
+  name     = "my-crypto-key"
+  key_ring = data.google_kms_key_ring.my_key_ring.self_link
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/google_kms_crypto_key_version.html.markdown b/third_party/terraform/website/docs/d/google_kms_crypto_key_version.html.markdown
index 93cc08b1ed4e..e0b00e157c08 100644
--- a/third_party/terraform/website/docs/d/google_kms_crypto_key_version.html.markdown
+++ b/third_party/terraform/website/docs/d/google_kms_crypto_key_version.html.markdown
@@ -26,11 +26,11 @@ data "google_kms_key_ring" "my_key_ring" {
 
 data "google_kms_crypto_key" "my_crypto_key" {
   name     = "my-crypto-key"
-  key_ring = "${data.google_kms_key_ring.my_key_ring.self_link}"
+  key_ring = data.google_kms_key_ring.my_key_ring.self_link
 }
 
 data "google_kms_crypto_key_version" "my_crypto_key_version" {
-  crypto_key = "${data.google_kms_key.my_key.self_link}"
+  crypto_key = data.google_kms_key.my_key.self_link
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/google_kms_secret.html.markdown b/third_party/terraform/website/docs/d/google_kms_secret.html.markdown
index 47014bda0583..55bdbc936c34 100644
--- a/third_party/terraform/website/docs/d/google_kms_secret.html.markdown
+++ b/third_party/terraform/website/docs/d/google_kms_secret.html.markdown
@@ -33,7 +33,7 @@ resource "google_kms_key_ring" "my_key_ring" {
 
 resource "google_kms_crypto_key" "my_crypto_key" {
   name     = "my-crypto-key"
-  key_ring = "${google_kms_key_ring.my_key_ring.self_link}"
+  key_ring = google_kms_key_ring.my_key_ring.self_link
 }
 ```
 
@@ -56,7 +56,7 @@ Finally, reference the encrypted ciphertext in your resource definitions:
 
 ```hcl
 data "google_kms_secret" "sql_user_password" {
-  crypto_key = "${google_kms_crypto_key.my_crypto_key.self_link}"
+  crypto_key = google_kms_crypto_key.my_crypto_key.self_link
   ciphertext = "CiQAqD+xX4SXOSziF4a8JYvq4spfAuWhhYSNul33H85HnVtNQW4SOgDu2UZ46dQCRFl5MF6ekabviN8xq+F+2035ZJ85B+xTYXqNf4mZs0RJitnWWuXlYQh6axnnJYu3kDU="
 }
 
@@ -74,9 +74,9 @@ resource "google_sql_database_instance" "master" {
 
 resource "google_sql_user" "users" {
   name     = "me"
-  instance = "${google_sql_database_instance.master.name}"
+  instance = google_sql_database_instance.master.name
   host     = "me.com"
-  password = "${data.google_kms_secret.sql_user_password.plaintext}"
+  password = data.google_kms_secret.sql_user_password.plaintext
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/google_kms_secret_ciphertext.html.markdown b/third_party/terraform/website/docs/d/google_kms_secret_ciphertext.html.markdown
index a83e27f602c5..40e85ab43bc3 100644
--- a/third_party/terraform/website/docs/d/google_kms_secret_ciphertext.html.markdown
+++ b/third_party/terraform/website/docs/d/google_kms_secret_ciphertext.html.markdown
@@ -33,7 +33,7 @@ resource "google_kms_key_ring" "my_key_ring" {
 
 resource "google_kms_crypto_key" "my_crypto_key" {
   name     = "my-crypto-key"
-  key_ring = "${google_kms_key_ring.my_key_ring.self_link}"
+  key_ring = google_kms_key_ring.my_key_ring.self_link
 }
 ```
 
@@ -41,8 +41,8 @@ Next, encrypt some sensitive information and use the encrypted data in your reso
 
 ```hcl
 data "google_kms_secret_ciphertext" "my_password" {
-  crypto_key = "${google_kms_crypto_key.my_crypto_key.self_link}"
-  plaintext = "my-secret-password"
+  crypto_key = google_kms_crypto_key.my_crypto_key.self_link
+  plaintext  = "my-secret-password"
 }
 
 resource "google_compute_instance" "instance" {
@@ -64,7 +64,7 @@ resource "google_compute_instance" "instance" {
   }
 
   metadata = {
-    password = "${data.google_kms_secret_ciphertext.my_password.ciphertext}"
+    password = data.google_kms_secret_ciphertext.my_password.ciphertext
   }
 }
 ```
diff --git a/third_party/terraform/website/docs/d/google_organization.html.markdown b/third_party/terraform/website/docs/d/google_organization.html.markdown
index 4168109714e6..d94792423880 100644
--- a/third_party/terraform/website/docs/d/google_organization.html.markdown
+++ b/third_party/terraform/website/docs/d/google_organization.html.markdown
@@ -18,7 +18,7 @@ data "google_organization" "org" {
 
 resource "google_folder" "sales" {
   display_name = "Sales"
-  parent       = "${data.google_organization.org.name}"
+  parent       = data.google_organization.org.name
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/google_project.html.markdown b/third_party/terraform/website/docs/d/google_project.html.markdown
index 069939a89aa8..4887fd87a45f 100644
--- a/third_party/terraform/website/docs/d/google_project.html.markdown
+++ b/third_party/terraform/website/docs/d/google_project.html.markdown
@@ -16,10 +16,11 @@ For more information see
 ## Example Usage
 
 ```hcl
-data "google_project" "project" {}
+data "google_project" "project" {
+}
 
 output "project_number" {
-  value = "${data.google_project.project.number}"
+  value = data.google_project.project.number
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/google_projects.html.markdown b/third_party/terraform/website/docs/d/google_projects.html.markdown
index f71a4cf4c69c..4fc3762d1b39 100644
--- a/third_party/terraform/website/docs/d/google_projects.html.markdown
+++ b/third_party/terraform/website/docs/d/google_projects.html.markdown
@@ -21,7 +21,7 @@ data "google_projects" "my-org-projects" {
 }
 
 data "google_project" "deletion-candidate" {
-   project_id = "${data.google_projects.my-org-projects.projects.0.project_id}"
+  project_id = data.google_projects.my-org-projects.projects[0].project_id
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/google_storage_project_service_account.html.markdown b/third_party/terraform/website/docs/d/google_storage_project_service_account.html.markdown
index 8ab1e5a98af9..017e712944b6 100644
--- a/third_party/terraform/website/docs/d/google_storage_project_service_account.html.markdown
+++ b/third_party/terraform/website/docs/d/google_storage_project_service_account.html.markdown
@@ -20,13 +20,14 @@ For more information see
 ## Example Usage
 
 ```hcl
-data "google_storage_project_service_account" "gcs_account" {}
+data "google_storage_project_service_account" "gcs_account" {
+}
 
 resource "google_pubsub_topic_iam_binding" "binding" {
-	topic       = "${google_pubsub_topic.topic.name}"
-	role        = "roles/pubsub.publisher"
-		  
-	members     = ["serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}"]
+  topic = google_pubsub_topic.topic.name
+  role  = "roles/pubsub.publisher"
+
+  members = ["serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}"]
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/google_storage_transfer_project_service_account.html.markdown b/third_party/terraform/website/docs/d/google_storage_transfer_project_service_account.html.markdown
index 06daf3ae0110..b3ad3bdaeb98 100644
--- a/third_party/terraform/website/docs/d/google_storage_transfer_project_service_account.html.markdown
+++ b/third_party/terraform/website/docs/d/google_storage_transfer_project_service_account.html.markdown
@@ -14,10 +14,11 @@ Use this data source to retrieve Storage Transfer service account for this proje
 ## Example Usage
 
 ```hcl
-data "google_storage_transfer_project_service_account" "default" { }
+data "google_storage_transfer_project_service_account" "default" {
+}
 
 output "default_account" {
-  value = "${data.google_storage_transfer_project_service_account.default.email}"
+  value = data.google_storage_transfer_project_service_account.default.email
 }
 ```
 
diff --git a/third_party/terraform/website/docs/d/signed_url.html.markdown b/third_party/terraform/website/docs/d/signed_url.html.markdown
index fee03ac2b55e..6946cd25b1ad 100644
--- a/third_party/terraform/website/docs/d/signed_url.html.markdown
+++ b/third_party/terraform/website/docs/d/signed_url.html.markdown
@@ -22,15 +22,15 @@ data "google_storage_object_signed_url" "artifact" {
 }
 
 resource "google_compute_instance" "vm" {
-    name = "vm"
-
-    provisioner "remote-exec" {
-        inline = [
-                "wget '${data.google_storage_object_signed_url.artifact.signed_url}' -O install_file.bin",
-                "chmod +x install_file.bin",
-                "./install_file.bin"
-                ]
-     }
+  name = "vm"
+
+  provisioner "remote-exec" {
+    inline = [
+      "wget '${data.google_storage_object_signed_url.artifact.signed_url}' -O install_file.bin",
+      "chmod +x install_file.bin",
+      "./install_file.bin",
+    ]
+  }
 }
 ```
 
@@ -43,7 +43,7 @@ data "google_storage_object_signed_url" "get_url" {
   content_md5  = "pRviqwS4c4OTJRTe03FD1w=="
   content_type = "text/plain"
   duration     = "2d"
-  credentials  = "${file("path/to/credentials.json")}"
+  credentials  = file("path/to/credentials.json")
 
   extension_headers = {
     x-goog-if-generation-match = 1