From 3b0cbe6496bc5027d55cabe5143cc958ce05f2ab Mon Sep 17 00:00:00 2001
From: kt <kt@katbyte.me>
Date: Thu, 27 Jun 2019 15:22:19 -0700
Subject: [PATCH] run terrafmt on acctests and website (#3742)

---
 ...data_source_api_management_product_test.go |   1 -
 .../data_source_api_management_user_test.go   |  17 +-
 azurerm/data_source_app_service_plan_test.go  |  26 +--
 .../data_source_application_insights_test.go  |  20 +-
 azurerm/data_source_availability_set_test.go  |  10 +-
 azurerm/data_source_batch_certificate_test.go |  21 +-
 azurerm/data_source_batch_pool_test.go        |  32 +--
 .../data_source_express_route_circuit_test.go |   2 +-
 azurerm/data_source_firewall_test.go          |   2 +-
 azurerm/data_source_policy_definition_test.go |   6 +-
 azurerm/data_source_redis_cache_test.go       |   5 +-
 ...virtual_network_gateway_connection_test.go |  75 ++++---
 ...pi_management_api_operation_policy_test.go |  31 +--
 ...e_arm_api_management_api_operation_test.go |  41 ++--
 ...urce_arm_api_management_api_policy_test.go |  29 +--
 ...pi_management_authorization_server_test.go |  29 ++-
 ...urce_arm_api_management_group_user_test.go |  28 +--
 ...resource_arm_api_management_logger_test.go |   4 +-
 ...rce_arm_api_management_product_api_test.go |   9 +-
 ...e_arm_api_management_product_group_test.go |  16 +-
 ..._arm_api_management_product_policy_test.go |  23 +-
 ...source_arm_api_management_property_test.go |   2 +-
 ...ce_arm_api_management_subscription_test.go |  12 +-
 azurerm/resource_arm_api_management_test.go   |   2 +-
 .../resource_arm_api_management_user_test.go  | 120 +++++-----
 azurerm/resource_arm_app_service_plan_test.go |  24 +-
 azurerm/resource_arm_app_service_slot_test.go |   3 +-
 azurerm/resource_arm_app_service_test.go      | 123 ++++++-----
 .../resource_arm_application_gateway_test.go  | 197 ++++++++++-------
 ..._arm_application_insights_webtests_test.go |   2 +-
 .../resource_arm_batch_certificate_test.go    |  52 ++---
 azurerm/resource_arm_batch_pool_test.go       |  58 ++---
 .../resource_arm_connection_monitor_test.go   |  10 +-
 azurerm/resource_arm_container_group_test.go  |  68 +++---
 ...rce_arm_data_factory_dataset_mysql_test.go |  14 +-
 ...rm_data_factory_dataset_postgresql_test.go |  14 +-
 ...a_factory_dataset_sql_server_table_test.go |  18 +-
 ...ked_service_data_lake_storage_gen2_test.go |   4 +-
 ..._data_factory_linked_service_mysql_test.go |   4 +-
 ..._factory_linked_service_postgresql_test.go |   4 +-
 ..._factory_linked_service_sql_server_test.go |   4 +-
 ...resource_arm_data_factory_pipeline_test.go |   6 +-
 azurerm/resource_arm_data_factory_test.go     | 153 ++++++-------
 azurerm/resource_arm_eventgrid_domain_test.go |   9 +-
 ...e_arm_eventgrid_event_subscription_test.go |  66 +++---
 ...rewall_application_rule_collection_test.go |   1 +
 ...e_arm_firewall_nat_rule_collection_test.go |  78 +++----
 azurerm/resource_arm_function_app_test.go     |   6 +-
 ...ource_arm_hdinsight_hadoop_cluster_test.go |   8 +-
 ...source_arm_hdinsight_hbase_cluster_test.go |   8 +-
 ...dinsight_interactive_query_cluster_test.go |   6 +-
 ...source_arm_hdinsight_kafka_cluster_test.go |   8 +-
 ..._arm_hdinsight_ml_services_cluster_test.go |   8 +-
 ...urce_arm_hdinsight_rserver_cluster_test.go |   8 +-
 ...source_arm_hdinsight_spark_cluster_test.go |   8 +-
 ...source_arm_hdinsight_storm_cluster_test.go |   8 +-
 azurerm/resource_arm_image_test.go            |   1 -
 .../resource_arm_iot_dps_certificate_test.go  |  30 +--
 azurerm/resource_arm_iot_dps_test.go          |   8 +-
 azurerm/resource_arm_iothub_test.go           |  24 +-
 ...source_arm_key_vault_access_policy_test.go |   6 +-
 ...resource_arm_key_vault_certificate_test.go |  12 +-
 azurerm/resource_arm_key_vault_key_test.go    |  32 +--
 azurerm/resource_arm_key_vault_secret_test.go |  14 +-
 azurerm/resource_arm_key_vault_test.go        |  45 ++--
 .../resource_arm_kubernetes_cluster_test.go   |  10 +-
 ...rce_arm_loadbalancer_outbound_rule_test.go |  81 ++++---
 .../resource_arm_loadbalancer_rule_test.go    |  14 +-
 azurerm/resource_arm_loadbalancer_test.go     |   8 +-
 ...source_arm_log_analytics_workspace_test.go |   2 +-
 ...rce_arm_network_connection_monitor_test.go |  10 +-
 ...ication_security_group_association_test.go |   2 +-
 .../resource_arm_policy_assignment_test.go    |   2 +
 ...resource_arm_policy_set_definition_test.go |   2 +-
 ...ource_arm_postgresql_configuration_test.go |   2 +-
 .../resource_arm_redis_firewall_rule_test.go  |  12 +-
 ...ource_arm_scheduler_job_collection_test.go |   3 +-
 ...esource_arm_service_fabric_cluster_test.go |  10 +-
 azurerm/resource_arm_storage_account_test.go  |  26 +--
 azurerm/resource_arm_storage_blob_test.go     |   4 +-
 ..._analytics_function_javascript_udf_test.go |   2 +
 .../resource_arm_stream_analytics_job_test.go |   4 +-
 ...m_stream_analytics_output_eventhub_test.go |  28 +--
 ..._arm_stream_analytics_output_mssql_test.go |  51 ++---
 ...stream_analytics_stream_input_blob_test.go |  72 +++---
 azurerm/resource_arm_subnet_test.go           |  12 +-
 ...urce_arm_virtual_machine_extension_test.go |   1 -
 ...rm_virtual_machine_unmanaged_disks_test.go |  24 +-
 .../managed_service_identity.html.markdown    |  12 +-
 .../docs/d/api_management_group.html.markdown |   2 +-
 .../docs/d/api_management_user.html.markdown  |   2 +-
 website/docs/d/batch_account.html.markdown    |   2 +-
 .../docs/d/batch_certificate.html.markdown    |   3 +-
 .../d/express_route_circuit.html.markdown     |   8 +-
 website/docs/d/firewall.html.markdown         |   2 +-
 .../docs/d/hdinsight_cluster.html.markdown    |   2 +-
 website/docs/d/key_vault_secret.html.markdown |   2 +-
 website/docs/d/redis_cache.html.markdown      |   1 -
 website/docs/d/role_definition.markdown       |   3 +-
 website/docs/d/sql_server.html.markdown       |   2 +-
 .../d/user_assigned_identity.html.markdown    |  88 ++++----
 ...l_network_gateway_connection.html.markdown | 206 +++++++++---------
 ...agement_api_operation_policy.html.markdown |  13 +-
 .../r/api_management_api_policy.html.markdown |   9 +-
 .../r/api_management_api_schema.html.markdown |   1 -
 ...agement_authorization_server.html.markdown |   3 +-
 .../api_management_product_api.html.markdown  |   2 +-
 ...pi_management_product_policy.html.markdown |   7 +-
 .../docs/r/api_management_user.html.markdown  |  14 +-
 .../docs/r/application_gateway.html.markdown  |  12 +-
 website/docs/r/batch_account.html.markdown    |   2 +-
 website/docs/r/batch_pool.html.markdown       |   7 +-
 .../r/cosmosdb_mongo_collection.html.markdown |  11 +-
 .../r/cosmosdb_sql_database.html.markdown     |   2 +-
 ...rvice_data_lake_storage_gen2.html.markdown |   7 +-
 ...ry_linked_service_postgresql.html.markdown |   2 +-
 .../docs/r/ddos_protection_plan.html.markdown |   2 +-
 ...eventgrid_event_subscription.html.markdown |  35 +--
 ..._application_rule_collection.html.markdown |  10 +-
 ...firewall_nat_rule_collection.html.markdown |  10 +-
 ...wall_network_rule_collection.html.markdown |  10 +-
 .../r/hdinsight_hadoop_cluster.html.markdown  |   8 +-
 .../r/hdinsight_hbase_cluster.html.markdown   |   8 +-
 ...ht_interactive_query_cluster.html.markdown |   8 +-
 ...dinsight_ml_services_cluster.html.markdown |   8 +-
 .../r/hdinsight_rserver_cluster.html.markdown |   8 +-
 .../docs/r/iot_dps_certificate.html.markdown  |   8 +-
 website/docs/r/iothub.html.markdown           |   2 +-
 .../iothub_shared_access_policy.html.markdown |   3 +-
 .../r/key_vault_access_policy.html.markdown   |   2 +-
 .../r/key_vault_certificate.html.markdown     |  48 +++-
 website/docs/r/key_vault_key.html.markdown    |   6 +-
 website/docs/r/key_vault_secret.html.markdown |   4 +-
 ...alancer_backend_address_pool.html.markdown |   8 +-
 .../r/loadbalancer_nat_pool.html.markdown     |   8 +-
 .../r/loadbalancer_nat_rule.html.markdown     |   8 +-
 .../loadbalancer_outbound_rule.html.markdown  |  18 +-
 .../docs/r/loadbalancer_probe.html.markdown   |   8 +-
 .../docs/r/loadbalancer_rule.html.markdown    |   8 +-
 website/docs/r/management_group.html.markdown |  10 +-
 .../r/media_services_account.html.markdown    |   2 +-
 website/docs/r/mysql_server.html.markdown     |   4 +-
 ...network_ddos_protection_plan.html.markdown |   2 +-
 ...n_security_group_association.html.markdown |   2 +-
 website/docs/r/public_ip_prefix.html.markdown |   2 +-
 ...tics_function_javascript_udf.html.markdown |   1 +
 ...am_analytics_output_eventhub.html.markdown |   1 -
 ...tream_analytics_output_mssql.html.markdown | 176 +++++++--------
 ..._analytics_stream_input_blob.html.markdown |  18 +-
 ...nalytics_stream_input_iothub.html.markdown |   1 -
 website/docs/r/subnet.html.markdown           |   2 +
 website/docs/r/virtual_network.html.markdown  |   2 +-
 152 files changed, 1557 insertions(+), 1428 deletions(-)

diff --git a/azurerm/data_source_api_management_product_test.go b/azurerm/data_source_api_management_product_test.go
index 1b8c5aed460b..6a81fe584235 100644
--- a/azurerm/data_source_api_management_product_test.go
+++ b/azurerm/data_source_api_management_product_test.go
@@ -54,7 +54,6 @@ resource "azurerm_api_management" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
-
 resource "azurerm_api_management_product" "test" {
   product_id            = "test-product"
   api_management_name   = "${azurerm_api_management.test.name}"
diff --git a/azurerm/data_source_api_management_user_test.go b/azurerm/data_source_api_management_user_test.go
index e757346ccf9c..288ce1e3f9f7 100644
--- a/azurerm/data_source_api_management_user_test.go
+++ b/azurerm/data_source_api_management_user_test.go
@@ -53,16 +53,15 @@ resource "azurerm_api_management" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
-
 resource "azurerm_api_management_user" "test" {
-  user_id               = "test-user"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  first_name            = "Acceptance"
-  last_name             = "Test"
-  email                 = "azure-acctest%d@example.com"
-  state                 = "active"
-  note                  = "Used for testing in dimension C-137."
+  user_id             = "test-user"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  first_name          = "Acceptance"
+  last_name           = "Test"
+  email               = "azure-acctest%d@example.com"
+  state               = "active"
+  note                = "Used for testing in dimension C-137."
 }
 
 data "azurerm_api_management_user" "test" {
diff --git a/azurerm/data_source_app_service_plan_test.go b/azurerm/data_source_app_service_plan_test.go
index f74ee05f39a1..bd68b5878999 100644
--- a/azurerm/data_source_app_service_plan_test.go
+++ b/azurerm/data_source_app_service_plan_test.go
@@ -204,26 +204,26 @@ data "azurerm_app_service_plan" "test" {
 func testAccDataSourceAppServicePlan_basicWindowsContainer(rInt int, location string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {
-	name     = "acctestRG-%d"
-	location = "%s"
+  name     = "acctestRG-%d"
+  location = "%s"
 }
 
 resource "azurerm_app_service_plan" "test" {
-	name                = "acctestASP-%d"
-	location            = "${azurerm_resource_group.test.location}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
-	is_xenon            = true
-	kind                = "xenon"
+  name                = "acctestASP-%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  is_xenon            = true
+  kind                = "xenon"
 
-	sku {
-		tier = "PremiumContainer"
-		size = "PC2"
-	}
+  sku {
+    tier = "PremiumContainer"
+    size = "PC2"
+  }
 }
 
 data "azurerm_app_service_plan" "test" {
-	name                = "${azurerm_app_service_plan.test.name}"
-	resource_group_name = "${azurerm_app_service_plan.test.resource_group_name}"
+  name                = "${azurerm_app_service_plan.test.name}"
+  resource_group_name = "${azurerm_app_service_plan.test.resource_group_name}"
 }
 `, rInt, location, rInt)
 }
diff --git a/azurerm/data_source_application_insights_test.go b/azurerm/data_source_application_insights_test.go
index feac4cfebdd0..cd84ade5d72a 100644
--- a/azurerm/data_source_application_insights_test.go
+++ b/azurerm/data_source_application_insights_test.go
@@ -36,19 +36,19 @@ func TestAccDataSourceApplicationInsights_basic(t *testing.T) {
 func testAccResourceApplicationInsights_complete(rInt int, location string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {
-	name     = "acctestRG-%[1]d"
-	location = "%[2]s"
+  name     = "acctestRG-%[1]d"
+  location = "%[2]s"
 }
 
 resource "azurerm_application_insights" "test" {
-	name                = "acctestappinsights-%[1]d"
-	location            = "${azurerm_resource_group.test.location}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
-	application_type    = "other"
-
-	tags = {
-		"foo" = "bar"
-	}
+  name                = "acctestappinsights-%[1]d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  application_type    = "other"
+
+  tags = {
+    "foo" = "bar"
+  }
 }
 
 data "azurerm_application_insights" "test" {
diff --git a/azurerm/data_source_availability_set_test.go b/azurerm/data_source_availability_set_test.go
index 12d4893443ad..d0b961772357 100644
--- a/azurerm/data_source_availability_set_test.go
+++ b/azurerm/data_source_availability_set_test.go
@@ -34,8 +34,8 @@ func TestAccDataSourceAvailabilitySet_basic(t *testing.T) {
 func testAccDataSourceAvailabilitySet_basic(rInt int, location string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {
-	name     = "acctestRG-%[1]d"
-	location = "%[2]s"
+  name     = "acctestRG-%[1]d"
+  location = "%[2]s"
 }
 
 resource "azurerm_availability_set" "test" {
@@ -43,9 +43,9 @@ resource "azurerm_availability_set" "test" {
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
 
-	tags = {
-		"foo" = "bar"
-	}
+  tags = {
+    "foo" = "bar"
+  }
 }
 
 data "azurerm_availability_set" "test" {
diff --git a/azurerm/data_source_batch_certificate_test.go b/azurerm/data_source_batch_certificate_test.go
index 967413496468..1230299c6080 100644
--- a/azurerm/data_source_batch_certificate_test.go
+++ b/azurerm/data_source_batch_certificate_test.go
@@ -50,20 +50,19 @@ resource "azurerm_batch_account" "test" {
 }
 
 resource "azurerm_batch_certificate" "test" {
-	resource_group_name  = "${azurerm_resource_group.test.name}"
-	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${filebase64("testdata/batch_certificate.pfx")}"
-	format               = "Pfx"
-	password             = "terraform"
-	thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
-	thumbprint_algorithm = "SHA1"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  account_name         = "${azurerm_batch_account.test.name}"
+  certificate          = "${filebase64("testdata/batch_certificate.pfx")}"
+  format               = "Pfx"
+  password             = "terraform"
+  thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
+  thumbprint_algorithm = "SHA1"
 }
 
 data "azurerm_batch_certificate" "test" {
-	name                = "${azurerm_batch_certificate.test.name}"
-	account_name        = "${azurerm_batch_account.test.name}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
+  name                = "${azurerm_batch_certificate.test.name}"
+  account_name        = "${azurerm_batch_account.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 }
-  
 `, rInt, location, rString)
 }
diff --git a/azurerm/data_source_batch_pool_test.go b/azurerm/data_source_batch_pool_test.go
index d21ee83d67af..1d91f1f7d330 100644
--- a/azurerm/data_source_batch_pool_test.go
+++ b/azurerm/data_source_batch_pool_test.go
@@ -88,23 +88,23 @@ resource "azurerm_batch_account" "test" {
 }
 
 resource "azurerm_batch_certificate" "test" {
-	resource_group_name  = "${azurerm_resource_group.test.name}"
-	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${filebase64("testdata/batch_certificate.pfx")}"
-	format               = "Pfx"
-	password             = "terraform"
-	thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
-	thumbprint_algorithm = "SHA1"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  account_name         = "${azurerm_batch_account.test.name}"
+  certificate          = "${filebase64("testdata/batch_certificate.pfx")}"
+  format               = "Pfx"
+  password             = "terraform"
+  thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
+  thumbprint_algorithm = "SHA1"
 }
 
 resource "azurerm_batch_pool" "test" {
-  name                   = "testaccpool%s"
-  resource_group_name    = "${azurerm_resource_group.test.name}"
-  account_name           = "${azurerm_batch_account.test.name}"
-  display_name           = "Test Acc Pool"
-  vm_size                = "Standard_A1"
-  node_agent_sku_id      = "batch.node.ubuntu 16.04"
-  max_tasks_per_node     = 2
+  name                = "testaccpool%s"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  account_name        = "${azurerm_batch_account.test.name}"
+  display_name        = "Test Acc Pool"
+  vm_size             = "Standard_A1"
+  node_agent_sku_id   = "batch.node.ubuntu 16.04"
+  max_tasks_per_node  = 2
 
   fixed_scale {
     target_dedicated_nodes = 2
@@ -121,13 +121,13 @@ resource "azurerm_batch_pool" "test" {
   certificate {
     id             = "${azurerm_batch_certificate.test.id}"
     store_location = "CurrentUser"
-    visibility     = [ "StartTask", "RemoteUser" ]
+    visibility     = ["StartTask", "RemoteUser"]
   }
 
   container_configuration {
     type = "DockerCompatible"
   }
-  
+
   start_task {
     command_line         = "echo 'Hello World from $env'"
     max_task_retry_count = 1
diff --git a/azurerm/data_source_express_route_circuit_test.go b/azurerm/data_source_express_route_circuit_test.go
index d2932c4816b3..f533beaf57b6 100644
--- a/azurerm/data_source_express_route_circuit_test.go
+++ b/azurerm/data_source_express_route_circuit_test.go
@@ -43,5 +43,5 @@ func testAccDataSourceAzureRMExpressRoute_basic(rInt int, location string) strin
 		resource_group_name = "${azurerm_resource_group.test.name}"
   		name                = "${azurerm_express_route_circuit.test.name}"
 	}
-	`, config)
+`, config)
 }
diff --git a/azurerm/data_source_firewall_test.go b/azurerm/data_source_firewall_test.go
index 1cebdb22cb14..3519fe4ec166 100644
--- a/azurerm/data_source_firewall_test.go
+++ b/azurerm/data_source_firewall_test.go
@@ -71,7 +71,7 @@ resource "azurerm_firewall" "test" {
 }
 
 data "azurerm_firewall" "test" {
-	name                = "${azurerm_firewall.test.name}"
+  name                = "${azurerm_firewall.test.name}"
   resource_group_name = "${azurerm_resource_group.test.name}"
 }
 `, rInt, location, rInt, rInt, rInt)
diff --git a/azurerm/data_source_policy_definition_test.go b/azurerm/data_source_policy_definition_test.go
index 0cd94b0e486d..d7163daebd40 100644
--- a/azurerm/data_source_policy_definition_test.go
+++ b/azurerm/data_source_policy_definition_test.go
@@ -79,7 +79,6 @@ data "azurerm_policy_definition" "test" {
 
 func testAccDataSourceBuiltInPolicyDefinitionAtManagementGroup(name string) string {
 	return fmt.Sprintf(`
-
 data "azurerm_client_config" "current" {}
 
 data "azurerm_policy_definition" "test" {
@@ -97,7 +96,7 @@ resource "azurerm_policy_definition" "test_policy" {
   mode         = "All"
   display_name = "acctestpol-%d"
 
-  policy_rule  = <<POLICY_RULE
+  policy_rule = <<POLICY_RULE
   {
     "if": {
       "not": {
@@ -132,9 +131,8 @@ METADATA
 }
 
 data "azurerm_policy_definition" "test" {
-	display_name = "${azurerm_policy_definition.test_policy.display_name}"
+  display_name = "${azurerm_policy_definition.test_policy.display_name}"
 }
-
 `, ri, ri)
 }
 
diff --git a/azurerm/data_source_redis_cache_test.go b/azurerm/data_source_redis_cache_test.go
index 2074a127b886..e92832e7fdfe 100644
--- a/azurerm/data_source_redis_cache_test.go
+++ b/azurerm/data_source_redis_cache_test.go
@@ -42,9 +42,8 @@ func testAccDataSourceAzureRMRedisCache_standardWithDataSource(rInt int, locatio
 %s
 
 data "azurerm_redis_cache" "test" {
-	  name                = "${azurerm_redis_cache.test.name}"
-  	  resource_group_name = "${azurerm_redis_cache.test.resource_group_name}"
-
+  name                = "${azurerm_redis_cache.test.name}"
+  resource_group_name = "${azurerm_redis_cache.test.resource_group_name}"
 }
 `, config)
 }
diff --git a/azurerm/data_source_virtual_network_gateway_connection_test.go b/azurerm/data_source_virtual_network_gateway_connection_test.go
index 6136845c67cc..f4ed61388a34 100644
--- a/azurerm/data_source_virtual_network_gateway_connection_test.go
+++ b/azurerm/data_source_virtual_network_gateway_connection_test.go
@@ -99,35 +99,41 @@ func testAccAzureRMDataSourceVirtualNetworkGatewayConnection_sitetosite(rInt int
 variable "random" {
   default = "%d"
 }
+
 resource "azurerm_resource_group" "test" {
   name     = "acctestRG-${var.random}"
   location = "%s"
 }
+
 resource "azurerm_virtual_network" "test" {
   name                = "acctestvn-${var.random}"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
   address_space       = ["10.0.0.0/16"]
 }
+
 resource "azurerm_subnet" "test" {
   name                 = "GatewaySubnet"
   resource_group_name  = "${azurerm_resource_group.test.name}"
   virtual_network_name = "${azurerm_virtual_network.test.name}"
   address_prefix       = "10.0.1.0/24"
 }
+
 resource "azurerm_public_ip" "test" {
   name                = "acctest-${var.random}"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
   allocation_method   = "Dynamic"
 }
+
 resource "azurerm_virtual_network_gateway" "test" {
   name                = "acctest-${var.random}"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  type     = "Vpn"
-  vpn_type = "RouteBased"
-  sku      = "Basic"
+  type                = "Vpn"
+  vpn_type            = "RouteBased"
+  sku                 = "Basic"
+
   ip_configuration {
     name                          = "vnetGatewayConfig"
     public_ip_address_id          = "${azurerm_public_ip.test.id}"
@@ -135,28 +141,29 @@ resource "azurerm_virtual_network_gateway" "test" {
     subnet_id                     = "${azurerm_subnet.test.id}"
   }
 }
+
 resource "azurerm_local_network_gateway" "test" {
   name                = "acctest-${var.random}"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  gateway_address = "168.62.225.23"
-  address_space   = ["10.1.1.0/24"]
+  gateway_address     = "168.62.225.23"
+  address_space       = ["10.1.1.0/24"]
 }
+
 resource "azurerm_virtual_network_gateway_connection" "test" {
-  name                = "acctest-${var.random}"
-  location            = "${azurerm_resource_group.test.location}"
-  resource_group_name = "${azurerm_resource_group.test.name}"
+  name                       = "acctest-${var.random}"
+  location                   = "${azurerm_resource_group.test.location}"
+  resource_group_name        = "${azurerm_resource_group.test.name}"
   type                       = "IPsec"
   virtual_network_gateway_id = "${azurerm_virtual_network_gateway.test.id}"
   local_network_gateway_id   = "${azurerm_local_network_gateway.test.id}"
-  shared_key = "4-v3ry-53cr37-1p53c-5h4r3d-k3y"
+  shared_key                 = "4-v3ry-53cr37-1p53c-5h4r3d-k3y"
 }
 
 data "azurerm_virtual_network_gateway_connection" "test" {
-	name                = "${azurerm_virtual_network_gateway_connection.test.name}"
-	resource_group_name = "${azurerm_virtual_network_gateway_connection.test.resource_group_name}"
+  name                = "${azurerm_virtual_network_gateway_connection.test.name}"
+  resource_group_name = "${azurerm_virtual_network_gateway_connection.test.resource_group_name}"
 }
-
 `, rInt, location)
 }
 
@@ -285,13 +292,13 @@ resource "azurerm_virtual_network_gateway_connection" "test_2" {
 }
 
 data "azurerm_virtual_network_gateway_connection" "test_1" {
-	name                = "${azurerm_virtual_network_gateway_connection.test_1.name}"
-	resource_group_name = "${azurerm_virtual_network_gateway_connection.test_1.resource_group_name}"
+  name                = "${azurerm_virtual_network_gateway_connection.test_1.name}"
+  resource_group_name = "${azurerm_virtual_network_gateway_connection.test_1.resource_group_name}"
 }
 
 data "azurerm_virtual_network_gateway_connection" "test_2" {
-	name                = "${azurerm_virtual_network_gateway_connection.test_2.name}"
-	resource_group_name = "${azurerm_virtual_network_gateway_connection.test_2.resource_group_name}"
+  name                = "${azurerm_virtual_network_gateway_connection.test_2.name}"
+  resource_group_name = "${azurerm_virtual_network_gateway_connection.test_2.resource_group_name}"
 }
 `, rInt, rInt2, sharedKey, location, altLocation)
 }
@@ -301,35 +308,41 @@ func testAccAzureRMDataSourceVirtualNetworkGatewayConnection_ipsecpolicy(rInt in
 variable "random" {
   default = "%d"
 }
+
 resource "azurerm_resource_group" "test" {
   name     = "acctestRG-${var.random}"
   location = "%s"
 }
+
 resource "azurerm_virtual_network" "test" {
   name                = "acctestvn-${var.random}"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
   address_space       = ["10.0.0.0/16"]
 }
+
 resource "azurerm_subnet" "test" {
   name                 = "GatewaySubnet"
   resource_group_name  = "${azurerm_resource_group.test.name}"
   virtual_network_name = "${azurerm_virtual_network.test.name}"
   address_prefix       = "10.0.1.0/24"
 }
+
 resource "azurerm_public_ip" "test" {
   name                = "acctest-${var.random}"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
   allocation_method   = "Dynamic"
 }
+
 resource "azurerm_virtual_network_gateway" "test" {
   name                = "acctest-${var.random}"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  type     = "Vpn"
-  vpn_type = "RouteBased"
-  sku      = "VpnGw1"
+  type                = "Vpn"
+  vpn_type            = "RouteBased"
+  sku                 = "VpnGw1"
+
   ip_configuration {
     name                          = "vnetGatewayConfig"
     public_ip_address_id          = "${azurerm_public_ip.test.id}"
@@ -337,22 +350,25 @@ resource "azurerm_virtual_network_gateway" "test" {
     subnet_id                     = "${azurerm_subnet.test.id}"
   }
 }
+
 resource "azurerm_local_network_gateway" "test" {
   name                = "acctest-${var.random}"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  gateway_address = "168.62.225.23"
-  address_space   = ["10.1.1.0/24"]
+  gateway_address     = "168.62.225.23"
+  address_space       = ["10.1.1.0/24"]
 }
+
 resource "azurerm_virtual_network_gateway_connection" "test" {
-  name                = "acctest-${var.random}"
-  location            = "${azurerm_resource_group.test.location}"
-  resource_group_name = "${azurerm_resource_group.test.name}"
-  type                       = "IPsec"
-  virtual_network_gateway_id = "${azurerm_virtual_network_gateway.test.id}"
-  local_network_gateway_id   = "${azurerm_local_network_gateway.test.id}"
+  name                               = "acctest-${var.random}"
+  location                           = "${azurerm_resource_group.test.location}"
+  resource_group_name                = "${azurerm_resource_group.test.name}"
+  type                               = "IPsec"
+  virtual_network_gateway_id         = "${azurerm_virtual_network_gateway.test.id}"
+  local_network_gateway_id           = "${azurerm_local_network_gateway.test.id}"
   use_policy_based_traffic_selectors = true
   routing_weight                     = 20
+
   ipsec_policy {
     dh_group         = "DHGroup14"
     ike_encryption   = "AES256"
@@ -363,12 +379,13 @@ resource "azurerm_virtual_network_gateway_connection" "test" {
     sa_datasize      = 102400000
     sa_lifetime      = 27000
   }
+
   shared_key = "4-v3ry-53cr37-1p53c-5h4r3d-k3y"
 }
 
 data "azurerm_virtual_network_gateway_connection" "test" {
-	name                = "${azurerm_virtual_network_gateway_connection.test.name}"
-	resource_group_name = "${azurerm_virtual_network_gateway_connection.test.resource_group_name}"
+  name                = "${azurerm_virtual_network_gateway_connection.test.name}"
+  resource_group_name = "${azurerm_virtual_network_gateway_connection.test.resource_group_name}"
 }
 `, rInt, location)
 }
diff --git a/azurerm/resource_arm_api_management_api_operation_policy_test.go b/azurerm/resource_arm_api_management_api_operation_policy_test.go
index 7d546f286848..93fc9309acb4 100644
--- a/azurerm/resource_arm_api_management_api_operation_policy_test.go
+++ b/azurerm/resource_arm_api_management_api_operation_policy_test.go
@@ -161,11 +161,11 @@ func testAccAzureRMApiManagementAPIOperationPolicy_basic(rInt int, location stri
 %s
 
 resource "azurerm_api_management_api_operation_policy" "test" {
-  api_name              = "${azurerm_api_management_api.test.name}"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  operation_id          = "${azurerm_api_management_api_operation.test.operation_id}"
-  xml_link              = "https://gist.githubusercontent.com/tombuildsstuff/4f58581599d2c9f64b236f505a361a67/raw/0d29dcb0167af1e5afe4bd52a6d7f69ba1e05e1f/example.xml"
+  api_name            = "${azurerm_api_management_api.test.name}"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  operation_id        = "${azurerm_api_management_api_operation.test.operation_id}"
+  xml_link            = "https://gist.githubusercontent.com/tombuildsstuff/4f58581599d2c9f64b236f505a361a67/raw/0d29dcb0167af1e5afe4bd52a6d7f69ba1e05e1f/example.xml"
 }
 `, template)
 }
@@ -176,11 +176,11 @@ func testAccAzureRMApiManagementAPIOperationPolicy_requiresImport(rInt int, loca
 %s
 
 resource "azurerm_api_management_api_operation_policy" "import" {
-  api_name              = "${azurerm_api_management_api_policy.test.api_name}"
-  api_management_name   = "${azurerm_api_management_api_policy.test.api_management_name}"
-  resource_group_name   = "${azurerm_api_management_api_policy.test.resource_group_name}"
-  operation_id          = "${azurerm_api_management_api_operation.test.operation_id}"
-  xml_link              = "${azurerm_api_management_api_policy.test.xml_link}"
+  api_name            = "${azurerm_api_management_api_policy.test.api_name}"
+  api_management_name = "${azurerm_api_management_api_policy.test.api_management_name}"
+  resource_group_name = "${azurerm_api_management_api_policy.test.resource_group_name}"
+  operation_id        = "${azurerm_api_management_api_operation.test.operation_id}"
+  xml_link            = "${azurerm_api_management_api_policy.test.xml_link}"
 }
 `, template)
 }
@@ -191,11 +191,12 @@ func testAccAzureRMApiManagementAPIOperationPolicy_updated(rInt int, location st
 %s
 
 resource "azurerm_api_management_api_operation_policy" "test" {
-  api_name              = "${azurerm_api_management_api.test.name}"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  operation_id          = "${azurerm_api_management_api_operation.test.operation_id}"
-  xml_content           = <<XML
+  api_name            = "${azurerm_api_management_api.test.name}"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  operation_id        = "${azurerm_api_management_api_operation.test.operation_id}"
+
+  xml_content = <<XML
 <policies>
   <inbound>
     <find-and-replace from="xyz" to="abc" />
diff --git a/azurerm/resource_arm_api_management_api_operation_test.go b/azurerm/resource_arm_api_management_api_operation_test.go
index 2430bfe973db..9bc3d61c36f2 100644
--- a/azurerm/resource_arm_api_management_api_operation_test.go
+++ b/azurerm/resource_arm_api_management_api_operation_test.go
@@ -311,17 +311,16 @@ resource "azurerm_api_management_api_operation" "test" {
   method              = "DELETE"
   url_template        = "/user1"
   description         = "This can only be done by the logged in user."
-  
+
   request {
     description = "Created user object"
 
     representation {
       content_type = "application/json"
-      type_name = "User"
+      type_name    = "User"
     }
   }
 }
-
 `, template)
 }
 
@@ -339,17 +338,16 @@ resource "azurerm_api_management_api_operation" "test" {
   method              = "DELETE"
   url_template        = "/user1"
   description         = "This can only be done by the logged in user."
-  
+
   request {
     description = "Created user object"
 
     representation {
       content_type = "application/json"
-      type_name = "User"
+      type_name    = "User"
     }
   }
 }
-
 `, template)
 }
 
@@ -367,10 +365,10 @@ resource "azurerm_api_management_api_operation" "test" {
   method              = "DELETE"
   url_template        = "/user1"
   description         = "This can only be done by the logged in user."
-  
+
   request {
     description = "Created user object"
-    
+
     header {
       name     = "X-Test-Operation"
       required = true
@@ -379,14 +377,14 @@ resource "azurerm_api_management_api_operation" "test" {
 
     representation {
       content_type = "application/json"
-      type_name = "User"
+      type_name    = "User"
     }
   }
 
   response {
     status_code = 200
     description = "successful operation"
-    
+
     header {
       name     = "X-Test-Operation"
       required = true
@@ -395,7 +393,8 @@ resource "azurerm_api_management_api_operation" "test" {
 
     representation {
       content_type = "application/xml"
-      sample       = <<SAMPLE
+
+      sample = <<SAMPLE
 <response>
   <user name="bravo24">
     <groups>
@@ -408,7 +407,6 @@ SAMPLE
     }
   }
 }
-
 `, template)
 }
 
@@ -426,13 +424,13 @@ resource "azurerm_api_management_api_operation" "test" {
   method              = "DELETE"
   url_template        = "/user1"
   description         = "This can only be done by the logged in user."
-  
+
   request {
     description = "Created user object"
 
     representation {
       content_type = "application/json"
-      type_name = "User"
+      type_name    = "User"
     }
   }
 
@@ -442,7 +440,8 @@ resource "azurerm_api_management_api_operation" "test" {
 
     representation {
       content_type = "application/xml"
-      sample       = <<SAMPLE
+
+      sample = <<SAMPLE
 <response>
   <user name="bravo24">
     <groups>
@@ -455,7 +454,6 @@ SAMPLE
     }
   }
 }
-
 `, template)
 }
 
@@ -473,13 +471,13 @@ resource "azurerm_api_management_api_operation" "test" {
   method              = "DELETE"
   url_template        = "/user1"
   description         = "This can only be done by the logged in user."
-  
+
   request {
     description = "Created user object"
 
     representation {
       content_type = "application/json"
-      type_name = "User"
+      type_name    = "User"
     }
   }
 
@@ -489,7 +487,8 @@ resource "azurerm_api_management_api_operation" "test" {
 
     representation {
       content_type = "application/xml"
-      sample       = <<SAMPLE
+
+      sample = <<SAMPLE
 <response>
   <user name="bravo24">
     <groups>
@@ -503,7 +502,8 @@ SAMPLE
 
     representation {
       content_type = "application/json"
-      sample       = <<SAMPLE
+
+      sample = <<SAMPLE
 {
   "user": {
     "groups": [
@@ -522,7 +522,6 @@ SAMPLE
     }
   }
 }
-
 `, template)
 }
 
diff --git a/azurerm/resource_arm_api_management_api_policy_test.go b/azurerm/resource_arm_api_management_api_policy_test.go
index 508994eac2ae..3b745d4d7f1e 100644
--- a/azurerm/resource_arm_api_management_api_policy_test.go
+++ b/azurerm/resource_arm_api_management_api_policy_test.go
@@ -164,6 +164,7 @@ resource "azurerm_api_management" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   publisher_name      = "pub1"
   publisher_email     = "pub1@email.com"
+
   sku {
     name     = "Developer"
     capacity = 1
@@ -181,10 +182,10 @@ resource "azurerm_api_management_api" "test" {
 }
 
 resource "azurerm_api_management_api_policy" "test" {
-  api_name              = "${azurerm_api_management_api.test.name}"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  xml_link              = "https://gist.githubusercontent.com/tombuildsstuff/4f58581599d2c9f64b236f505a361a67/raw/0d29dcb0167af1e5afe4bd52a6d7f69ba1e05e1f/example.xml"
+  api_name            = "${azurerm_api_management_api.test.name}"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  xml_link            = "https://gist.githubusercontent.com/tombuildsstuff/4f58581599d2c9f64b236f505a361a67/raw/0d29dcb0167af1e5afe4bd52a6d7f69ba1e05e1f/example.xml"
 }
 `, rInt, location, rInt, rInt)
 }
@@ -195,10 +196,10 @@ func testAccAzureRMApiManagementAPIPolicy_requiresImport(rInt int, location stri
 %s
 
 resource "azurerm_api_management_api_policy" "import" {
-  api_name              = "${azurerm_api_management_api_policy.test.api_name}"
-  api_management_name   = "${azurerm_api_management_api_policy.test.api_management_name}"
-  resource_group_name   = "${azurerm_api_management_api_policy.test.resource_group_name}"
-  xml_link              = "${azurerm_api_management_api_policy.test.xml_link}"
+  api_name            = "${azurerm_api_management_api_policy.test.api_name}"
+  api_management_name = "${azurerm_api_management_api_policy.test.api_management_name}"
+  resource_group_name = "${azurerm_api_management_api_policy.test.resource_group_name}"
+  xml_link            = "${azurerm_api_management_api_policy.test.xml_link}"
 }
 `, template)
 }
@@ -209,13 +210,14 @@ resource "azurerm_resource_group" "test" {
   name     = "acctestRG-%d"
   location = "%s"
 }
-	
+
 resource "azurerm_api_management" "test" {
   name                = "acctestAM-%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
   publisher_name      = "pub1"
   publisher_email     = "pub1@email.com"
+
   sku {
     name     = "Developer"
     capacity = 1
@@ -233,10 +235,11 @@ resource "azurerm_api_management_api" "test" {
 }
 
 resource "azurerm_api_management_api_policy" "test" {
-  api_name              = "${azurerm_api_management_api.test.name}"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  xml_content           = <<XML
+  api_name            = "${azurerm_api_management_api.test.name}"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+
+  xml_content = <<XML
 <policies>
   <inbound>
     <find-and-replace from="xyz" to="abc" />
diff --git a/azurerm/resource_arm_api_management_authorization_server_test.go b/azurerm/resource_arm_api_management_authorization_server_test.go
index be70e24d260a..fdd230104957 100644
--- a/azurerm/resource_arm_api_management_authorization_server_test.go
+++ b/azurerm/resource_arm_api_management_authorization_server_test.go
@@ -152,10 +152,12 @@ resource "azurerm_api_management_authorization_server" "test" {
   authorization_endpoint       = "https://azacctest.hashicorptest.com/client/authorize"
   client_id                    = "42424242-4242-4242-4242-424242424242"
   client_registration_endpoint = "https://azacctest.hashicorptest.com/client/register"
+
   grant_types = [
     "implicit",
   ]
-  authorization_methods        = [
+
+  authorization_methods = [
     "GET",
   ]
 }
@@ -176,7 +178,8 @@ resource "azurerm_api_management_authorization_server" "import" {
   client_id                    = "${azurerm_api_management_authorization_server.test.client_id}"
   client_registration_endpoint = "${azurerm_api_management_authorization_server.test.client_registration_endpoint}"
   grant_types                  = "${azurerm_api_management_authorization_server.test.grant_types}"
-  authorization_methods        = [
+
+  authorization_methods = [
     "GET",
   ]
 }
@@ -196,22 +199,26 @@ resource "azurerm_api_management_authorization_server" "test" {
   authorization_endpoint       = "https://azacctest.hashicorptest.com/client/authorize"
   client_id                    = "42424242-4242-4242-4242-424242424242"
   client_registration_endpoint = "https://azacctest.hashicorptest.com/client/register"
+
   grant_types = [
-     "authorizationCode",
+    "authorizationCode",
   ]
-  authorization_methods        = [
+
+  authorization_methods = [
     "GET",
     "POST",
   ]
+
   bearer_token_sending_methods = [
-    "authorizationHeader"
+    "authorizationHeader",
   ]
-  client_secret                = "n1n3-m0re-s3a5on5-m0r1y"
-  default_scope                = "read write"
-  token_endpoint               = "https://azacctest.hashicorptest.com/client/token"
-  resource_owner_username      = "rick"
-  resource_owner_password      = "C-193P"
-  support_state                = true
+
+  client_secret           = "n1n3-m0re-s3a5on5-m0r1y"
+  default_scope           = "read write"
+  token_endpoint          = "https://azacctest.hashicorptest.com/client/token"
+  resource_owner_username = "rick"
+  resource_owner_password = "C-193P"
+  support_state           = true
 }
 `, template, rInt)
 }
diff --git a/azurerm/resource_arm_api_management_group_user_test.go b/azurerm/resource_arm_api_management_group_user_test.go
index cb54a927a845..d441b42a4166 100644
--- a/azurerm/resource_arm_api_management_group_user_test.go
+++ b/azurerm/resource_arm_api_management_group_user_test.go
@@ -143,19 +143,19 @@ resource "azurerm_api_management_group" "test" {
 }
 
 resource "azurerm_api_management_user" "test" {
-  user_id               = "acctestuser%d"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  first_name            = "Acceptance"
-  last_name             = "Test"
-  email                 = "azure-acctest%d@example.com"
+  user_id             = "acctestuser%d"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  first_name          = "Acceptance"
+  last_name           = "Test"
+  email               = "azure-acctest%d@example.com"
 }
 
 resource "azurerm_api_management_group_user" "test" {
-  user_id               = "${azurerm_api_management_user.test.user_id}"
-  group_name            = "${azurerm_api_management_group.test.name}"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
+  user_id             = "${azurerm_api_management_user.test.user_id}"
+  group_name          = "${azurerm_api_management_group.test.name}"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 }
 `, rInt, location, rInt, rInt, rInt, rInt)
 }
@@ -166,10 +166,10 @@ func testAccAzureRMAPIManagementGroupUser_requiresImport(rInt int, location stri
 %s
 
 resource "azurerm_api_management_group_user" "import" {
-  user_id               = "${azurerm_api_management_group_user.test.user_id}"
-  group_name            = "${azurerm_api_management_group_user.test.group_name}"
-  api_management_name   = "${azurerm_api_management_group_user.test.api_management_name}"
-  resource_group_name   = "${azurerm_api_management_group_user.test.resource_group_name}"
+  user_id             = "${azurerm_api_management_group_user.test.user_id}"
+  group_name          = "${azurerm_api_management_group_user.test.group_name}"
+  api_management_name = "${azurerm_api_management_group_user.test.api_management_name}"
+  resource_group_name = "${azurerm_api_management_group_user.test.resource_group_name}"
 }
 `, template)
 }
diff --git a/azurerm/resource_arm_api_management_logger_test.go b/azurerm/resource_arm_api_management_logger_test.go
index 5c6f33770dcf..7e10e655f773 100644
--- a/azurerm/resource_arm_api_management_logger_test.go
+++ b/azurerm/resource_arm_api_management_logger_test.go
@@ -305,7 +305,7 @@ resource "azurerm_api_management_logger" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
 
   eventhub {
-    name = "${azurerm_eventhub.test.name}"
+    name              = "${azurerm_eventhub.test.name}"
     connection_string = "${azurerm_eventhub_namespace.test.default_primary_connection_string}"
   }
 }
@@ -323,7 +323,7 @@ resource "azurerm_api_management_logger" "import" {
   resource_group_name = "${azurerm_api_management_logger.test.resource_group_name}"
 
   eventhub {
-    name = "${azurerm_eventhub.test.name}"
+    name              = "${azurerm_eventhub.test.name}"
     connection_string = "${azurerm_eventhub_namespace.test.default_primary_connection_string}"
   }
 }
diff --git a/azurerm/resource_arm_api_management_product_api_test.go b/azurerm/resource_arm_api_management_product_api_test.go
index ed0970f33a6e..f23a51e8eb58 100644
--- a/azurerm/resource_arm_api_management_product_api_test.go
+++ b/azurerm/resource_arm_api_management_product_api_test.go
@@ -145,7 +145,6 @@ resource "azurerm_api_management_product" "test" {
   published             = true
 }
 
-
 resource "azurerm_api_management_api" "test" {
   name                = "acctestapi-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
@@ -157,10 +156,10 @@ resource "azurerm_api_management_api" "test" {
 }
 
 resource "azurerm_api_management_product_api" "test" {
-  product_id            = "${azurerm_api_management_product.test.product_id}"
-  api_name              = "${azurerm_api_management_api.test.name}"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
+  product_id          = "${azurerm_api_management_product.test.product_id}"
+  api_name            = "${azurerm_api_management_api.test.name}"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 }
 `, rInt, location, rInt, rInt)
 }
diff --git a/azurerm/resource_arm_api_management_product_group_test.go b/azurerm/resource_arm_api_management_product_group_test.go
index 2c721d54bc91..f9d82f4307b1 100644
--- a/azurerm/resource_arm_api_management_product_group_test.go
+++ b/azurerm/resource_arm_api_management_product_group_test.go
@@ -153,10 +153,10 @@ resource "azurerm_api_management_group" "test" {
 }
 
 resource "azurerm_api_management_product_group" "test" {
-  product_id            = "${azurerm_api_management_product.test.product_id}"
-  group_name            = "${azurerm_api_management_group.test.name}"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
+  product_id          = "${azurerm_api_management_product.test.product_id}"
+  group_name          = "${azurerm_api_management_group.test.name}"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 }
 `, rInt, location, rInt, rInt)
 }
@@ -167,10 +167,10 @@ func testAccAzureRMAPIManagementProductGroup_requiresImport(rInt int, location s
 %s
 
 resource "azurerm_api_management_product_group" "import" {
-  product_id            = "${azurerm_api_management_product_group.test.product_id}"
-  group_name            = "${azurerm_api_management_product_group.test.group_name}"
-  api_management_name   = "${azurerm_api_management_product_group.test.api_management_name}"
-  resource_group_name   = "${azurerm_api_management_product_group.test.resource_group_name}"
+  product_id          = "${azurerm_api_management_product_group.test.product_id}"
+  group_name          = "${azurerm_api_management_product_group.test.group_name}"
+  api_management_name = "${azurerm_api_management_product_group.test.api_management_name}"
+  resource_group_name = "${azurerm_api_management_product_group.test.resource_group_name}"
 }
 `, template)
 }
diff --git a/azurerm/resource_arm_api_management_product_policy_test.go b/azurerm/resource_arm_api_management_product_policy_test.go
index 325082f29241..cbfa6e0aa322 100644
--- a/azurerm/resource_arm_api_management_product_policy_test.go
+++ b/azurerm/resource_arm_api_management_product_policy_test.go
@@ -181,10 +181,10 @@ resource "azurerm_api_management_product" "test" {
 }
 
 resource "azurerm_api_management_product_policy" "test" {
-  product_id            = "${azurerm_api_management_product.test.product_id}"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  xml_link = "https://gist.githubusercontent.com/tombuildsstuff/4f58581599d2c9f64b236f505a361a67/raw/0d29dcb0167af1e5afe4bd52a6d7f69ba1e05e1f/example.xml"
+  product_id          = "${azurerm_api_management_product.test.product_id}"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  xml_link            = "https://gist.githubusercontent.com/tombuildsstuff/4f58581599d2c9f64b236f505a361a67/raw/0d29dcb0167af1e5afe4bd52a6d7f69ba1e05e1f/example.xml"
 }
 `, rInt, location, rInt)
 }
@@ -195,10 +195,10 @@ func testAccAzureRMApiManagementProductPolicy_requiresImport(rInt int, location
 %s
 
 resource "azurerm_api_management_product_policy" "import" {
-  product_id            = "${azurerm_api_management_product_policy.test.product_id}"
-  api_management_name   = "${azurerm_api_management_product_policy.test.api_management_name}"
-  resource_group_name   = "${azurerm_api_management_product_policy.test.resource_group_name}"
-  xml_link              = "${azurerm_api_management_product_policy.test.xml_link}"
+  product_id          = "${azurerm_api_management_product_policy.test.product_id}"
+  api_management_name = "${azurerm_api_management_product_policy.test.api_management_name}"
+  resource_group_name = "${azurerm_api_management_product_policy.test.resource_group_name}"
+  xml_link            = "${azurerm_api_management_product_policy.test.xml_link}"
 }
 `, template)
 }
@@ -233,9 +233,10 @@ resource "azurerm_api_management_product" "test" {
 }
 
 resource "azurerm_api_management_product_policy" "test" {
-  product_id            = "${azurerm_api_management_product.test.product_id}"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
+  product_id          = "${azurerm_api_management_product.test.product_id}"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+
   xml_content = <<XML
 <policies>
   <inbound>
diff --git a/azurerm/resource_arm_api_management_property_test.go b/azurerm/resource_arm_api_management_property_test.go
index 5356a0fa7bdd..80716d77d302 100644
--- a/azurerm/resource_arm_api_management_property_test.go
+++ b/azurerm/resource_arm_api_management_property_test.go
@@ -181,7 +181,7 @@ resource "azurerm_api_management" "test" {
 
   sku {
     name     = "Developer"
-	capacity = 1
+    capacity = 1
   }
 }
 
diff --git a/azurerm/resource_arm_api_management_subscription_test.go b/azurerm/resource_arm_api_management_subscription_test.go
index 32343e637168..f6518a615a09 100644
--- a/azurerm/resource_arm_api_management_subscription_test.go
+++ b/azurerm/resource_arm_api_management_subscription_test.go
@@ -285,12 +285,12 @@ resource "azurerm_api_management_product" "test" {
 }
 
 resource "azurerm_api_management_user" "test" {
-  user_id               = "acctestuser%d"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  first_name            = "Acceptance"
-  last_name             = "Test"
-  email                 = "azure-acctest%d@example.com"
+  user_id             = "acctestuser%d"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  first_name          = "Acceptance"
+  last_name           = "Test"
+  email               = "azure-acctest%d@example.com"
 }
 `, rInt, location, rInt, rInt, rInt)
 }
diff --git a/azurerm/resource_arm_api_management_test.go b/azurerm/resource_arm_api_management_test.go
index e0582009a608..4addeb92071c 100644
--- a/azurerm/resource_arm_api_management_test.go
+++ b/azurerm/resource_arm_api_management_test.go
@@ -429,7 +429,7 @@ resource "azurerm_api_management" "test" {
   }
 
   sign_up {
-    enabled          = true
+    enabled = true
 
     terms_of_service {
       enabled          = true
diff --git a/azurerm/resource_arm_api_management_user_test.go b/azurerm/resource_arm_api_management_user_test.go
index 2c3c6c2df20f..5c631c0bac2e 100644
--- a/azurerm/resource_arm_api_management_user_test.go
+++ b/azurerm/resource_arm_api_management_user_test.go
@@ -285,12 +285,12 @@ func testAccAzureRMApiManagementUser_basic(rInt int, location string) string {
 %s
 
 resource "azurerm_api_management_user" "test" {
-  user_id               = "acctestuser%d"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  first_name            = "Acceptance"
-  last_name             = "Test"
-  email                 = "azure-acctest%d@example.com"
+  user_id             = "acctestuser%d"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  first_name          = "Acceptance"
+  last_name           = "Test"
+  email               = "azure-acctest%d@example.com"
 }
 `, template, rInt, rInt)
 }
@@ -301,13 +301,13 @@ func testAccAzureRMApiManagementUser_requiresImport(rInt int, location string) s
 %s
 
 resource "azurerm_api_management_user" "import" {
-  user_id               = "${azurerm_api_management_user.test.user_id}"
-  api_management_name   = "${azurerm_api_management_user.test.api_management_name}"
-  resource_group_name   = "${azurerm_api_management_user.test.resource_group_name}"
-  first_name            = "${azurerm_api_management_user.test.first_name}"
-  last_name             = "${azurerm_api_management_user.test.last_name}"
-  email                 = "${azurerm_api_management_user.test.email}"
-  state                 = "${azurerm_api_management_user.test.state}"
+  user_id             = "${azurerm_api_management_user.test.user_id}"
+  api_management_name = "${azurerm_api_management_user.test.api_management_name}"
+  resource_group_name = "${azurerm_api_management_user.test.resource_group_name}"
+  first_name          = "${azurerm_api_management_user.test.first_name}"
+  last_name           = "${azurerm_api_management_user.test.last_name}"
+  email               = "${azurerm_api_management_user.test.email}"
+  state               = "${azurerm_api_management_user.test.state}"
 }
 `, template)
 }
@@ -318,14 +318,14 @@ func testAccAzureRMApiManagementUser_password(rInt int, location string) string
 %s
 
 resource "azurerm_api_management_user" "test" {
-  user_id               = "acctestuser%d"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  first_name            = "Acceptance"
-  last_name             = "Test"
-  email                 = "azure-acctest%d@example.com"
-  state                 = "active"
-  password              = "3991bb15-282d-4b9b-9de3-3d5fc89eb530"
+  user_id             = "acctestuser%d"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  first_name          = "Acceptance"
+  last_name           = "Test"
+  email               = "azure-acctest%d@example.com"
+  state               = "active"
+  password            = "3991bb15-282d-4b9b-9de3-3d5fc89eb530"
 }
 `, template, rInt, rInt)
 }
@@ -336,13 +336,13 @@ func testAccAzureRMApiManagementUser_updatedActive(rInt int, location string) st
 %s
 
 resource "azurerm_api_management_user" "test" {
-  user_id               = "acctestuser%d"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  first_name            = "Acceptance"
-  last_name             = "Test"
-  email                 = "azure-acctest%d@example.com"
-  state                 = "active"
+  user_id             = "acctestuser%d"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  first_name          = "Acceptance"
+  last_name           = "Test"
+  email               = "azure-acctest%d@example.com"
+  state               = "active"
 }
 `, template, rInt, rInt)
 }
@@ -353,13 +353,13 @@ func testAccAzureRMApiManagementUser_updatedBlocked(rInt int, location string) s
 %s
 
 resource "azurerm_api_management_user" "test" {
-  user_id               = "acctestuser%d"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  first_name            = "Acceptance Updated"
-  last_name             = "Test Updated"
-  email                 = "azure-acctest%d@example.com"
-  state                 = "blocked"
+  user_id             = "acctestuser%d"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  first_name          = "Acceptance Updated"
+  last_name           = "Test Updated"
+  email               = "azure-acctest%d@example.com"
+  state               = "blocked"
 }
 `, template, rInt, rInt)
 }
@@ -370,14 +370,14 @@ func testAccAzureRMApiManagementUser_invited(rInt int, location string) string {
 %s
 
 resource "azurerm_api_management_user" "test" {
-  user_id               = "acctestuser%d"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  first_name            = "Acceptance"
-  last_name             = "Test User"
-  email                 = "azure-acctest%d@example.com"
-  state                 = "blocked"
-  confirmation          = "invite"
+  user_id             = "acctestuser%d"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  first_name          = "Acceptance"
+  last_name           = "Test User"
+  email               = "azure-acctest%d@example.com"
+  state               = "blocked"
+  confirmation        = "invite"
 }
 `, template, rInt, rInt)
 }
@@ -388,14 +388,14 @@ func testAccAzureRMApiManagementUser_signUp(rInt int, location string) string {
 %s
 
 resource "azurerm_api_management_user" "test" {
-  user_id               = "acctestuser%d"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  first_name            = "Acceptance"
-  last_name             = "Test User"
-  email                 = "azure-acctest%d@example.com"
-  state                 = "blocked"
-  confirmation          = "signup"
+  user_id             = "acctestuser%d"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  first_name          = "Acceptance"
+  last_name           = "Test User"
+  email               = "azure-acctest%d@example.com"
+  state               = "blocked"
+  confirmation        = "signup"
 }
 `, template, rInt, rInt)
 }
@@ -406,15 +406,15 @@ func testAccAzureRMApiManagementUser_complete(rInt int, location string) string
 %s
 
 resource "azurerm_api_management_user" "test" {
-  user_id               = "acctestuser%d"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  first_name            = "Acceptance"
-  last_name             = "Test"
-  email                 = "azure-acctest%d@example.com"
-  state                 = "active"
-  confirmation          = "signup"
-  note                  = "Used for testing in dimension C-137."
+  user_id             = "acctestuser%d"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  first_name          = "Acceptance"
+  last_name           = "Test"
+  email               = "azure-acctest%d@example.com"
+  state               = "active"
+  confirmation        = "signup"
+  note                = "Used for testing in dimension C-137."
 }
 `, template, rInt, rInt)
 }
diff --git a/azurerm/resource_arm_app_service_plan_test.go b/azurerm/resource_arm_app_service_plan_test.go
index 5eae80394b56..91c60e4591b2 100644
--- a/azurerm/resource_arm_app_service_plan_test.go
+++ b/azurerm/resource_arm_app_service_plan_test.go
@@ -630,21 +630,21 @@ resource "azurerm_app_service_plan" "test" {
 func testAccAzureRMAppServicePlan_basicWindowsContainer(rInt int, location string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {
-	name     = "acctestRG-%d"
-	location = "%s"
+  name     = "acctestRG-%d"
+  location = "%s"
 }
 
 resource "azurerm_app_service_plan" "test" {
-	name                = "acctestASP-%d"
-	location            = "${azurerm_resource_group.test.location}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
-	kind                = "xenon"
-	is_xenon            = true
-
-	sku {
-		tier = "PremiumContainer"
-		size = "PC2"
-	}
+  name                = "acctestASP-%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  kind                = "xenon"
+  is_xenon            = true
+
+  sku {
+    tier = "PremiumContainer"
+    size = "PC2"
+  }
 }
 `, rInt, location, rInt)
 }
diff --git a/azurerm/resource_arm_app_service_slot_test.go b/azurerm/resource_arm_app_service_slot_test.go
index 92fd6f36cda7..bca4d40fc087 100644
--- a/azurerm/resource_arm_app_service_slot_test.go
+++ b/azurerm/resource_arm_app_service_slot_test.go
@@ -1426,8 +1426,9 @@ resource "azurerm_app_service_slot" "test" {
       allowed_origins = [
         "http://www.contoso.com",
         "www.contoso.com",
-        "contoso.com"
+        "contoso.com",
       ]
+
       support_credentials = true
     }
   }
diff --git a/azurerm/resource_arm_app_service_test.go b/azurerm/resource_arm_app_service_test.go
index 033fe5de6a65..b4c2b5a835cf 100644
--- a/azurerm/resource_arm_app_service_test.go
+++ b/azurerm/resource_arm_app_service_test.go
@@ -2538,30 +2538,30 @@ resource "azurerm_app_service" "test" {
 func testAccAzureRMAppService_zeroedIpRestriction(rInt int, location string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {
-	name     = "acctestRG-%d"
-	location = "%s"
+  name     = "acctestRG-%d"
+  location = "%s"
 }
 
 resource "azurerm_app_service_plan" "test" {
-	name                = "acctestASP-%d"
-	location            = "${azurerm_resource_group.test.location}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
+  name                = "acctestASP-%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 
-	sku {
-		tier = "Standard"
-		size = "S1"
-	}
+  sku {
+    tier = "Standard"
+    size = "S1"
+  }
 }
 
 resource "azurerm_app_service" "test" {
-	name                = "acctestAS-%d"
-	location            = "${azurerm_resource_group.test.location}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
-	app_service_plan_id = "${azurerm_app_service_plan.test.id}"
+  name                = "acctestAS-%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  app_service_plan_id = "${azurerm_app_service_plan.test.id}"
 
-	site_config {
-		ip_restriction = []
-	}
+  site_config {
+    ip_restriction = []
+  }
 }
 `, rInt, location, rInt, rInt)
 }
@@ -3119,27 +3119,32 @@ resource "azurerm_resource_group" "test" {
   name     = "acctestRG-%d"
   location = "%s"
 }
+
 resource "azurerm_app_service_plan" "test" {
   name                = "acctestASP-%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
+
   sku {
     tier = "Standard"
     size = "S1"
   }
 }
+
 resource "azurerm_app_service" "test" {
   name                = "acctestAS-%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
   app_service_plan_id = "${azurerm_app_service_plan.test.id}"
+
   site_config {
     cors {
       allowed_origins = [
         "http://www.contoso.com",
         "www.contoso.com",
-        "contoso.com"
+        "contoso.com",
       ]
+
       support_credentials = true
     }
   }
@@ -3231,9 +3236,9 @@ resource "azurerm_app_service" "test" {
   auth_settings {
     enabled = true
     issuer  = "https://sts.windows.net/%s"
-          
+
     allowed_external_redirect_urls = [
-      "https://terra.form"
+      "https://terra.form",
     ]
 
     active_directory {
@@ -3280,8 +3285,8 @@ resource "azurerm_app_service" "test" {
   }
 
   auth_settings {
-    enabled = true
-    issuer  = "https://sts.windows.net/%s"
+    enabled         = true
+    issuer          = "https://sts.windows.net/%s"
     runtime_version = "1.0"
 
     active_directory {
@@ -3328,8 +3333,8 @@ resource "azurerm_app_service" "test" {
   }
 
   auth_settings {
-    enabled = true
-    issuer  = "https://sts.windows.net/%s"
+    enabled                       = true
+    issuer                        = "https://sts.windows.net/%s"
     token_refresh_extension_hours = 75
 
     active_directory {
@@ -3376,8 +3381,8 @@ resource "azurerm_app_service" "test" {
   }
 
   auth_settings {
-    enabled = true
-    issuer  = "https://sts.windows.net/%s"
+    enabled             = true
+    issuer              = "https://sts.windows.net/%s"
     token_store_enabled = true
 
     active_directory {
@@ -3424,8 +3429,8 @@ resource "azurerm_app_service" "test" {
   }
 
   auth_settings {
-    enabled = true
-    issuer  = "https://sts.windows.net/%s"
+    enabled                       = true
+    issuer                        = "https://sts.windows.net/%s"
     unauthenticated_client_action = "RedirectToLoginPage"
 
     active_directory {
@@ -3474,6 +3479,7 @@ resource "azurerm_app_service" "test" {
   auth_settings {
     enabled = true
     issuer  = "https://sts.windows.net/%s"
+
     active_directory {
       client_id     = "aadclientid"
       client_secret = "aadsecret"
@@ -3519,6 +3525,7 @@ resource "azurerm_app_service" "test" {
 
   auth_settings {
     enabled = true
+
     facebook {
       app_id     = "facebookappid"
       app_secret = "facebookappsecret"
@@ -3564,6 +3571,7 @@ resource "azurerm_app_service" "test" {
 
   auth_settings {
     enabled = true
+
     google {
       client_id     = "googleclientid"
       client_secret = "googleclientsecret"
@@ -3596,6 +3604,7 @@ resource "azurerm_app_service_plan" "test" {
     size = "S1"
   }
 }
+
 resource "azurerm_app_service" "test" {
   name                = "acctestRG-%d"
   location            = "${azurerm_resource_group.test.location}"
@@ -3608,6 +3617,7 @@ resource "azurerm_app_service" "test" {
 
   auth_settings {
     enabled = true
+
     microsoft {
       client_id     = "microsoftclientid"
       client_secret = "microsoftclientsecret"
@@ -3653,9 +3663,10 @@ resource "azurerm_app_service" "test" {
 
   auth_settings {
     enabled = true
+
     twitter {
-      consumer_key     = "twitterconsumerkey"
-      consumer_secret  = "twitterconsumersecret"
+      consumer_key    = "twitterconsumerkey"
+      consumer_secret = "twitterconsumersecret"
     }
   }
 }
@@ -3705,7 +3716,7 @@ resource "azurerm_app_service" "test" {
         "activedirectorytokenaudiences",
       ]
     }
-    
+
     microsoft {
       client_id     = "microsoftclientid"
       client_secret = "microsoftclientsecret"
@@ -3722,38 +3733,38 @@ resource "azurerm_app_service" "test" {
 func testAccAzureRMAppService_basicWindowsContainer(rInt int, location string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {
-	name     = "acctestRG-%d"
-	location = "%s"
+  name     = "acctestRG-%d"
+  location = "%s"
 }
 
 resource "azurerm_app_service_plan" "test" {
-	name                = "acctestASP-%d"
-	location            = "${azurerm_resource_group.test.location}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
-	is_xenon            = true
-	kind                = "xenon"
-
-	sku {
-		tier = "PremiumContainer"
-		size = "PC2"
-	}
+  name                = "acctestASP-%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  is_xenon            = true
+  kind                = "xenon"
+
+  sku {
+    tier = "PremiumContainer"
+    size = "PC2"
+  }
 }
 
 resource "azurerm_app_service" "test" {
-	name                = "acctestAS-%d"
-	location            = "${azurerm_resource_group.test.location}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
-	app_service_plan_id = "${azurerm_app_service_plan.test.id}"
-	
-	site_config {
-	  windows_fx_version = "DOCKER|mcr.microsoft.com/azure-app-service/samples/aspnethelloworld:latest"
-	}
-	
-	app_settings = {
-		"DOCKER_REGISTRY_SERVER_URL" = "https://mcr.microsoft.com",
-		"DOCKER_REGISTRY_SERVER_USERNAME" = "",
-		"DOCKER_REGISTRY_SERVER_PASSWORD" = "",
-	}
+  name                = "acctestAS-%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  app_service_plan_id = "${azurerm_app_service_plan.test.id}"
+
+  site_config {
+    windows_fx_version = "DOCKER|mcr.microsoft.com/azure-app-service/samples/aspnethelloworld:latest"
+  }
+
+  app_settings = {
+    "DOCKER_REGISTRY_SERVER_URL"      = "https://mcr.microsoft.com"
+    "DOCKER_REGISTRY_SERVER_USERNAME" = ""
+    "DOCKER_REGISTRY_SERVER_PASSWORD" = ""
+  }
 }
 `, rInt, location, rInt, rInt)
 }
diff --git a/azurerm/resource_arm_application_gateway_test.go b/azurerm/resource_arm_application_gateway_test.go
index aeef2e5bb7d6..7394ae9c8c10 100644
--- a/azurerm/resource_arm_application_gateway_test.go
+++ b/azurerm/resource_arm_application_gateway_test.go
@@ -1268,8 +1268,8 @@ resource "azurerm_application_gateway" "test" {
   location            = "${azurerm_resource_group.test.location}"
 
   sku {
-    name     = "Standard_v2"
-    tier     = "Standard_v2"
+    name = "Standard_v2"
+    tier = "Standard_v2"
   }
 
   autoscale_configuration {
@@ -1369,7 +1369,7 @@ resource "azurerm_application_gateway" "test" {
   backend_http_settings {
     name                  = "${local.http_setting_name}"
     cookie_based_affinity = "Disabled"
-    path         = "/path1/"
+    path                  = "/path1/"
     port                  = 80
     protocol              = "Http"
     request_timeout       = 1
@@ -1783,17 +1783,17 @@ func testAccAzureRMApplicationGateway_routingRedirect_httpListener(rInt int, loc
 
 # since these variables are re-used - a locals block makes this more maintainable
 locals {
-  backend_address_pool_name       = "${azurerm_virtual_network.test.name}-beap"
-  frontend_port_name              = "${azurerm_virtual_network.test.name}-feport"
-  frontend_port_name2             = "${azurerm_virtual_network.test.name}-feport2"
-  frontend_ip_configuration_name  = "${azurerm_virtual_network.test.name}-feip"
-  http_setting_name               = "${azurerm_virtual_network.test.name}-be-htst"
-  listener_name                   = "${azurerm_virtual_network.test.name}-httplstn"
-  target_listener_name            = "${azurerm_virtual_network.test.name}-trgthttplstn"
-  request_routing_rule_name       = "${azurerm_virtual_network.test.name}-rqrt"
-  path_rule_name                  = "${azurerm_virtual_network.test.name}-pathrule1"
-  url_path_map_name               = "${azurerm_virtual_network.test.name}-urlpath1"
-  redirect_configuration_name     = "${azurerm_virtual_network.test.name}-Port80To8888Redirect"
+  backend_address_pool_name      = "${azurerm_virtual_network.test.name}-beap"
+  frontend_port_name             = "${azurerm_virtual_network.test.name}-feport"
+  frontend_port_name2            = "${azurerm_virtual_network.test.name}-feport2"
+  frontend_ip_configuration_name = "${azurerm_virtual_network.test.name}-feip"
+  http_setting_name              = "${azurerm_virtual_network.test.name}-be-htst"
+  listener_name                  = "${azurerm_virtual_network.test.name}-httplstn"
+  target_listener_name           = "${azurerm_virtual_network.test.name}-trgthttplstn"
+  request_routing_rule_name      = "${azurerm_virtual_network.test.name}-rqrt"
+  path_rule_name                 = "${azurerm_virtual_network.test.name}-pathrule1"
+  url_path_map_name              = "${azurerm_virtual_network.test.name}-urlpath1"
+  redirect_configuration_name    = "${azurerm_virtual_network.test.name}-Port80To8888Redirect"
 }
 
 resource "azurerm_application_gateway" "test" {
@@ -1878,17 +1878,17 @@ func testAccAzureRMApplicationGateway_routingRedirect_httpListenerError(rInt int
 
 # since these variables are re-used - a locals block makes this more maintainable
 locals {
-  backend_address_pool_name       = "${azurerm_virtual_network.test.name}-beap"
-  frontend_port_name              = "${azurerm_virtual_network.test.name}-feport"
-  frontend_port_name2             = "${azurerm_virtual_network.test.name}-feport2"
-  frontend_ip_configuration_name  = "${azurerm_virtual_network.test.name}-feip"
-  http_setting_name               = "${azurerm_virtual_network.test.name}-be-htst"
-  listener_name                   = "${azurerm_virtual_network.test.name}-httplstn"
-  target_listener_name            = "${azurerm_virtual_network.test.name}-trgthttplstn"
-  request_routing_rule_name       = "${azurerm_virtual_network.test.name}-rqrt"
-  path_rule_name                  = "${azurerm_virtual_network.test.name}-pathrule1"
-  url_path_map_name               = "${azurerm_virtual_network.test.name}-urlpath1"
-  redirect_configuration_name     = "${azurerm_virtual_network.test.name}-Port80To8888Redirect"
+  backend_address_pool_name      = "${azurerm_virtual_network.test.name}-beap"
+  frontend_port_name             = "${azurerm_virtual_network.test.name}-feport"
+  frontend_port_name2            = "${azurerm_virtual_network.test.name}-feport2"
+  frontend_ip_configuration_name = "${azurerm_virtual_network.test.name}-feip"
+  http_setting_name              = "${azurerm_virtual_network.test.name}-be-htst"
+  listener_name                  = "${azurerm_virtual_network.test.name}-httplstn"
+  target_listener_name           = "${azurerm_virtual_network.test.name}-trgthttplstn"
+  request_routing_rule_name      = "${azurerm_virtual_network.test.name}-rqrt"
+  path_rule_name                 = "${azurerm_virtual_network.test.name}-pathrule1"
+  url_path_map_name              = "${azurerm_virtual_network.test.name}-urlpath1"
+  redirect_configuration_name    = "${azurerm_virtual_network.test.name}-Port80To8888Redirect"
 }
 
 resource "azurerm_application_gateway" "test" {
@@ -2062,6 +2062,7 @@ resource "azurerm_application_gateway" "test" {
     path_rule {
       name                        = "${local.path_rule_name}"
       redirect_configuration_name = "${local.redirect_configuration_name}"
+
       paths = [
         "/test",
       ]
@@ -2075,7 +2076,6 @@ resource "azurerm_application_gateway" "test" {
         "/test2",
       ]
     }
-
   }
 
   redirect_configuration {
@@ -2617,10 +2617,10 @@ resource "azurerm_application_gateway" "test" {
   ]
 
   waf_configuration {
-    enabled          = true
-    firewall_mode    = "Detection"
-    rule_set_type    = "OWASP"
-    rule_set_version = "3.0"
+    enabled                  = true
+    firewall_mode            = "Detection"
+    rule_set_type            = "OWASP"
+    rule_set_version         = "3.0"
     file_upload_limit_mb     = 100
     request_body_check       = true
     max_request_body_size_kb = 100
@@ -2724,7 +2724,7 @@ resource "azurerm_application_gateway" "test" {
     protocol              = "Http"
     request_timeout       = 1
 
-	connection_draining {
+    connection_draining {
       enabled           = true
       drain_timeout_sec = 1984
     }
@@ -2762,7 +2762,6 @@ locals {
   request_routing_rule_name      = "${azurerm_virtual_network.test.name}-rqrt"
 }
 
-
 resource "azurerm_public_ip" "test_standard" {
   name                = "acctest-pubip-%d-standard"
   location            = "${azurerm_resource_group.test.location}"
@@ -2783,29 +2782,27 @@ resource "azurerm_application_gateway" "test" {
   }
 
   waf_configuration {
-    enabled                     = true
-    firewall_mode               = "Detection"
-    rule_set_type               = "OWASP"
-    rule_set_version            = "3.0"
-    request_body_check          = true
-    max_request_body_size_kb    = 128
-    file_upload_limit_mb        = 100
+    enabled                  = true
+    firewall_mode            = "Detection"
+    rule_set_type            = "OWASP"
+    rule_set_version         = "3.0"
+    request_body_check       = true
+    max_request_body_size_kb = 128
+    file_upload_limit_mb     = 100
 
     disabled_rule_group {
       rule_group_name = "REQUEST-921-PROTOCOL-ATTACK"
       rules           = [921110, 921151, 921180]
     }
-  
+
     disabled_rule_group {
       rule_group_name = "REQUEST-930-APPLICATION-ATTACK-LFI"
       rules           = [930120, 930130]
     }
-  
+
     disabled_rule_group {
       rule_group_name = "REQUEST-942-APPLICATION-ATTACK-SQLI"
     }
-    
-  
   }
 
   gateway_ip_configuration {
@@ -2868,7 +2865,6 @@ locals {
   request_routing_rule_name      = "${azurerm_virtual_network.test.name}-rqrt"
 }
 
-
 resource "azurerm_public_ip" "test_standard" {
   name                = "acctest-pubip-%d-standard"
   location            = "${azurerm_resource_group.test.location}"
@@ -2889,24 +2885,22 @@ resource "azurerm_application_gateway" "test" {
   }
 
   waf_configuration {
-    enabled                     = true
-    firewall_mode               = "Detection"
-    rule_set_type               = "OWASP"
-    rule_set_version            = "3.0"
-    request_body_check          = true
-    max_request_body_size_kb    = 128
-    file_upload_limit_mb        = 100
+    enabled                  = true
+    firewall_mode            = "Detection"
+    rule_set_type            = "OWASP"
+    rule_set_version         = "3.0"
+    request_body_check       = true
+    max_request_body_size_kb = 128
+    file_upload_limit_mb     = 100
 
     disabled_rule_group {
       rule_group_name = "REQUEST-921-PROTOCOL-ATTACK"
       rules           = [921110, 921151, 921180]
     }
-  
+
     disabled_rule_group {
       rule_group_name = "REQUEST-942-APPLICATION-ATTACK-SQLI"
     }
-    
-  
   }
 
   gateway_ip_configuration {
@@ -2969,7 +2963,6 @@ locals {
   request_routing_rule_name      = "${azurerm_virtual_network.test.name}-rqrt"
 }
 
-
 resource "azurerm_public_ip" "test_standard" {
   name                = "acctest-pubip-%d-standard"
   location            = "${azurerm_resource_group.test.location}"
@@ -2990,13 +2983,13 @@ resource "azurerm_application_gateway" "test" {
   }
 
   waf_configuration {
-    enabled                     = true
-    firewall_mode               = "Detection"
-    rule_set_type               = "OWASP"
-    rule_set_version            = "3.0"
-    request_body_check          = true
-    max_request_body_size_kb    = 128
-    file_upload_limit_mb        = 100
+    enabled                  = true
+    firewall_mode            = "Detection"
+    rule_set_type            = "OWASP"
+    rule_set_version         = "3.0"
+    request_body_check       = true
+    max_request_body_size_kb = 128
+    file_upload_limit_mb     = 100
 
     exclusion {
       match_variable          = "RequestArgNames"
@@ -3023,7 +3016,7 @@ resource "azurerm_application_gateway" "test" {
     }
 
     exclusion {
-      match_variable          = "RequestHeaderNames"
+      match_variable = "RequestHeaderNames"
     }
   }
 
@@ -3106,20 +3099,19 @@ resource "azurerm_application_gateway" "test" {
   }
 
   waf_configuration {
-    enabled                     = true
-    firewall_mode               = "Detection"
-    rule_set_type               = "OWASP"
-    rule_set_version            = "3.0"
-    request_body_check          = true
-    max_request_body_size_kb    = 128
-    file_upload_limit_mb        = 100
+    enabled                  = true
+    firewall_mode            = "Detection"
+    rule_set_type            = "OWASP"
+    rule_set_version         = "3.0"
+    request_body_check       = true
+    max_request_body_size_kb = 128
+    file_upload_limit_mb     = 100
 
     exclusion {
       match_variable          = "RequestArgNames"
       selector_match_operator = "Equals"
       selector                = "displayNameHtml"
     }
-
   }
 
   gateway_ip_configuration {
@@ -3180,6 +3172,7 @@ locals {
   listener_name                  = "${azurerm_virtual_network.test.name}-httplstn"
   request_routing_rule_name      = "${azurerm_virtual_network.test.name}-rqrt"
 }
+
 resource "azurerm_public_ip" "test_standard" {
   name                = "acctest-pubip-%d-standard"
   location            = "${azurerm_resource_group.test.location}"
@@ -3187,34 +3180,42 @@ resource "azurerm_public_ip" "test_standard" {
   sku                 = "Standard"
   allocation_method   = "Static"
 }
+
 resource "azurerm_application_gateway" "test" {
   name                = "acctestag-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   location            = "${azurerm_resource_group.test.location}"
+
   sku {
     name     = "Standard_v2"
     tier     = "Standard_v2"
     capacity = 1
   }
+
   ssl_policy {
     policy_name = "AppGwSslPolicy20170401S"
     policy_type = "Predefined"
   }
+
   gateway_ip_configuration {
     name      = "my-gateway-ip-configuration"
     subnet_id = "${azurerm_subnet.test.id}"
   }
+
   frontend_port {
     name = "${local.frontend_port_name}"
     port = 80
   }
+
   frontend_ip_configuration {
     name                 = "${local.frontend_ip_configuration_name}"
     public_ip_address_id = "${azurerm_public_ip.test_standard.id}"
   }
+
   backend_address_pool {
     name = "${local.backend_address_pool_name}"
   }
+
   backend_http_settings {
     name                  = "${local.http_setting_name}"
     cookie_based_affinity = "Disabled"
@@ -3222,12 +3223,14 @@ resource "azurerm_application_gateway" "test" {
     protocol              = "Http"
     request_timeout       = 1
   }
+
   http_listener {
     name                           = "${local.listener_name}"
     frontend_ip_configuration_name = "${local.frontend_ip_configuration_name}"
     frontend_port_name             = "${local.frontend_port_name}"
     protocol                       = "Http"
   }
+
   request_routing_rule {
     name                       = "${local.request_routing_rule_name}"
     rule_type                  = "Basic"
@@ -3252,6 +3255,7 @@ locals {
   listener_name                  = "${azurerm_virtual_network.test.name}-httplstn"
   request_routing_rule_name      = "${azurerm_virtual_network.test.name}-rqrt"
 }
+
 resource "azurerm_public_ip" "test_standard" {
   name                = "acctest-pubip-%d-standard"
   location            = "${azurerm_resource_group.test.location}"
@@ -3259,35 +3263,43 @@ resource "azurerm_public_ip" "test_standard" {
   sku                 = "Standard"
   allocation_method   = "Static"
 }
+
 resource "azurerm_application_gateway" "test" {
   name                = "acctestag-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   location            = "${azurerm_resource_group.test.location}"
+
   sku {
     name     = "Standard_v2"
     tier     = "Standard_v2"
     capacity = 1
   }
+
   ssl_policy {
-    policy_type = "Custom"
+    policy_type          = "Custom"
     min_protocol_version = "TLSv1_1"
-    cipher_suites = ["TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLS_RSA_WITH_AES_128_GCM_SHA256"]
+    cipher_suites        = ["TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLS_RSA_WITH_AES_128_GCM_SHA256"]
   }
+
   gateway_ip_configuration {
     name      = "my-gateway-ip-configuration"
     subnet_id = "${azurerm_subnet.test.id}"
   }
+
   frontend_port {
     name = "${local.frontend_port_name}"
     port = 80
   }
+
   frontend_ip_configuration {
     name                 = "${local.frontend_ip_configuration_name}"
     public_ip_address_id = "${azurerm_public_ip.test_standard.id}"
   }
+
   backend_address_pool {
     name = "${local.backend_address_pool_name}"
   }
+
   backend_http_settings {
     name                  = "${local.http_setting_name}"
     cookie_based_affinity = "Disabled"
@@ -3295,12 +3307,14 @@ resource "azurerm_application_gateway" "test" {
     protocol              = "Http"
     request_timeout       = 1
   }
+
   http_listener {
     name                           = "${local.listener_name}"
     frontend_ip_configuration_name = "${local.frontend_ip_configuration_name}"
     frontend_port_name             = "${local.frontend_port_name}"
     protocol                       = "Http"
   }
+
   request_routing_rule {
     name                       = "${local.request_routing_rule_name}"
     rule_type                  = "Basic"
@@ -3325,6 +3339,7 @@ locals {
   listener_name                  = "${azurerm_virtual_network.test.name}-httplstn"
   request_routing_rule_name      = "${azurerm_virtual_network.test.name}-rqrt"
 }
+
 resource "azurerm_public_ip" "test_standard" {
   name                = "acctest-pubip-%d-standard"
   location            = "${azurerm_resource_group.test.location}"
@@ -3332,33 +3347,41 @@ resource "azurerm_public_ip" "test_standard" {
   sku                 = "Standard"
   allocation_method   = "Static"
 }
+
 resource "azurerm_application_gateway" "test" {
   name                = "acctestag-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   location            = "${azurerm_resource_group.test.location}"
+
   sku {
     name     = "Standard_v2"
     tier     = "Standard_v2"
     capacity = 1
   }
+
   ssl_policy {
     disabled_protocols = ["TLSv1_0", "TLSv1_1"]
   }
+
   gateway_ip_configuration {
     name      = "my-gateway-ip-configuration"
     subnet_id = "${azurerm_subnet.test.id}"
   }
+
   frontend_port {
     name = "${local.frontend_port_name}"
     port = 80
   }
+
   frontend_ip_configuration {
     name                 = "${local.frontend_ip_configuration_name}"
     public_ip_address_id = "${azurerm_public_ip.test_standard.id}"
   }
+
   backend_address_pool {
     name = "${local.backend_address_pool_name}"
   }
+
   backend_http_settings {
     name                  = "${local.http_setting_name}"
     cookie_based_affinity = "Disabled"
@@ -3366,12 +3389,14 @@ resource "azurerm_application_gateway" "test" {
     protocol              = "Http"
     request_timeout       = 1
   }
+
   http_listener {
     name                           = "${local.listener_name}"
     frontend_ip_configuration_name = "${local.frontend_ip_configuration_name}"
     frontend_port_name             = "${local.frontend_port_name}"
     protocol                       = "Http"
   }
+
   request_routing_rule {
     name                       = "${local.request_routing_rule_name}"
     rule_type                  = "Basic"
@@ -3396,6 +3421,7 @@ locals {
   listener_name                  = "${azurerm_virtual_network.test.name}-httplstn"
   request_routing_rule_name      = "${azurerm_virtual_network.test.name}-rqrt"
 }
+
 resource "azurerm_public_ip" "test_standard" {
   name                = "acctest-pubip-%d-standard"
   location            = "${azurerm_resource_group.test.location}"
@@ -3403,31 +3429,39 @@ resource "azurerm_public_ip" "test_standard" {
   sku                 = "Standard"
   allocation_method   = "Static"
 }
+
 resource "azurerm_application_gateway" "test" {
   name                = "acctestag-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   location            = "${azurerm_resource_group.test.location}"
+
   sku {
     name     = "Standard_v2"
     tier     = "Standard_v2"
     capacity = 1
   }
+
   disabled_ssl_protocols = ["TLSv1_0", "TLSv1_1"]
+
   gateway_ip_configuration {
     name      = "my-gateway-ip-configuration"
     subnet_id = "${azurerm_subnet.test.id}"
   }
+
   frontend_port {
     name = "${local.frontend_port_name}"
     port = 80
   }
+
   frontend_ip_configuration {
     name                 = "${local.frontend_ip_configuration_name}"
     public_ip_address_id = "${azurerm_public_ip.test_standard.id}"
   }
+
   backend_address_pool {
     name = "${local.backend_address_pool_name}"
   }
+
   backend_http_settings {
     name                  = "${local.http_setting_name}"
     cookie_based_affinity = "Disabled"
@@ -3435,12 +3469,14 @@ resource "azurerm_application_gateway" "test" {
     protocol              = "Http"
     request_timeout       = 1
   }
+
   http_listener {
     name                           = "${local.listener_name}"
     frontend_ip_configuration_name = "${local.frontend_ip_configuration_name}"
     frontend_port_name             = "${local.frontend_port_name}"
     protocol                       = "Http"
   }
+
   request_routing_rule {
     name                       = "${local.request_routing_rule_name}"
     rule_type                  = "Basic"
@@ -3542,10 +3578,12 @@ resource "azurerm_application_gateway" "test" {
     frontend_ip_configuration_name = "${local.frontend_ip_configuration_name}"
     frontend_port_name             = "${local.frontend_port_name}"
     protocol                       = "Http"
+
     custom_error_configuration {
       status_code           = "HttpStatus403"
       custom_error_page_url = "http://azure.com/error403_listener.html"
     }
+
     custom_error_configuration {
       status_code           = "HttpStatus502"
       custom_error_page_url = "http://azure.com/error502_listener.html"
@@ -3656,16 +3694,16 @@ resource "azurerm_application_gateway" "test" {
     name = "${local.rewrite_rule_set_name}"
 
     rewrite_rule {
-      name = "${local.rewrite_rule_name}"
+      name          = "${local.rewrite_rule_name}"
       rule_sequence = 1
 
       condition {
         variable = "var_http_status"
-        pattern = "502"
+        pattern  = "502"
       }
 
       request_header_configuration {
-        header_name = "X-custom"
+        header_name  = "X-custom"
         header_value = "customvalue"
       }
     }
@@ -3771,16 +3809,16 @@ resource "azurerm_application_gateway" "test" {
     name = "${local.rewrite_rule_set_name}"
 
     rewrite_rule {
-      name = "${local.rewrite_rule_name}"
+      name          = "${local.rewrite_rule_name}"
       rule_sequence = 1
 
       condition {
         variable = "var_http_status"
-        pattern = "502"
+        pattern  = "502"
       }
 
       request_header_configuration {
-        header_name = "X-custom"
+        header_name  = "X-custom"
         header_value = "customvalue"
       }
     }
@@ -3952,7 +3990,6 @@ resource "azurerm_subnet" "test1" {
   address_prefix       = "10.0.1.0/24"
 }
 
-
 # since these variables are re-used - a locals block makes this more maintainable
 locals {
   backend_address_pool_name      = "${azurerm_virtual_network.test.name}-beap"
diff --git a/azurerm/resource_arm_application_insights_webtests_test.go b/azurerm/resource_arm_application_insights_webtests_test.go
index 30d3db0de7b6..e02ad7f9aa87 100644
--- a/azurerm/resource_arm_application_insights_webtests_test.go
+++ b/azurerm/resource_arm_application_insights_webtests_test.go
@@ -262,7 +262,7 @@ resource "azurerm_application_insights_web_test" "import" {
   resource_group_name     = "${azurerm_application_insights_web_test.test.resource_group_name}"
   application_insights_id = "${azurerm_application_insights_web_test.test.application_insights_id}"
   kind                    = "${azurerm_application_insights_web_test.test.kind}"
-  configuration			  = "${azurerm_application_insights_web_test.test.configuration}"
+  configuration           = "${azurerm_application_insights_web_test.test.configuration}"
 }
 `, template)
 }
diff --git a/azurerm/resource_arm_batch_certificate_test.go b/azurerm/resource_arm_batch_certificate_test.go
index 1f67b5e455d9..eeff78cc23f1 100644
--- a/azurerm/resource_arm_batch_certificate_test.go
+++ b/azurerm/resource_arm_batch_certificate_test.go
@@ -127,13 +127,13 @@ resource "azurerm_batch_account" "test" {
 }
 
 resource "azurerm_batch_certificate" "test" {
-	resource_group_name  = "${azurerm_resource_group.test.name}"
-	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${filebase64("testdata/batch_certificate.pfx")}"
-	format               = "Pfx"
-	password             = "terraform"
-	thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
-	thumbprint_algorithm = "SHA1"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  account_name         = "${azurerm_batch_account.test.name}"
+  certificate          = "${filebase64("testdata/batch_certificate.pfx")}"
+  format               = "Pfx"
+  password             = "terraform"
+  thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
+  thumbprint_algorithm = "SHA1"
 }
 `, rInt, location, batchAccountSuffix)
 }
@@ -153,12 +153,12 @@ resource "azurerm_batch_account" "test" {
 }
 
 resource "azurerm_batch_certificate" "test" {
-	resource_group_name  = "${azurerm_resource_group.test.name}"
-	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${filebase64("testdata/batch_certificate.pfx")}"
-	format               = "Pfx"
-	thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
-	thumbprint_algorithm = "SHA1"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  account_name         = "${azurerm_batch_account.test.name}"
+  certificate          = "${filebase64("testdata/batch_certificate.pfx")}"
+  format               = "Pfx"
+  thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
+  thumbprint_algorithm = "SHA1"
 }
 `, rInt, location, batchAccountSuffix)
 }
@@ -177,12 +177,12 @@ resource "azurerm_batch_account" "test" {
 }
 
 resource "azurerm_batch_certificate" "test" {
-	resource_group_name  = "${azurerm_resource_group.test.name}"
-	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${filebase64("testdata/batch_certificate.cer")}"
-	format               = "Cer"
-	thumbprint           = "312D31A79FA0CEF49C00F769AFC2B73E9F4EDF34"
-	thumbprint_algorithm = "SHA1"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  account_name         = "${azurerm_batch_account.test.name}"
+  certificate          = "${filebase64("testdata/batch_certificate.cer")}"
+  format               = "Cer"
+  thumbprint           = "312D31A79FA0CEF49C00F769AFC2B73E9F4EDF34"
+  thumbprint_algorithm = "SHA1"
 }
 `, rInt, location, batchAccountSuffix)
 }
@@ -201,13 +201,13 @@ resource "azurerm_batch_account" "test" {
 }
 
 resource "azurerm_batch_certificate" "test" {
-	resource_group_name  = "${azurerm_resource_group.test.name}"
-	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${filebase64("testdata/batch_certificate.cer")}"
-	format               = "Cer"
-	password             = "should not have a password for Cer"
-	thumbprint           = "312D31A79FA0CEF49C00F769AFC2B73E9F4EDF34"
-	thumbprint_algorithm = "SHA1"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  account_name         = "${azurerm_batch_account.test.name}"
+  certificate          = "${filebase64("testdata/batch_certificate.cer")}"
+  format               = "Cer"
+  password             = "should not have a password for Cer"
+  thumbprint           = "312D31A79FA0CEF49C00F769AFC2B73E9F4EDF34"
+  thumbprint_algorithm = "SHA1"
 }
 `, rInt, location, batchAccountSuffix)
 }
diff --git a/azurerm/resource_arm_batch_pool_test.go b/azurerm/resource_arm_batch_pool_test.go
index 6b7ed79fee92..74c7fa620874 100644
--- a/azurerm/resource_arm_batch_pool_test.go
+++ b/azurerm/resource_arm_batch_pool_test.go
@@ -457,11 +457,11 @@ resource "azurerm_batch_pool" "test" {
   vm_size             = "Standard_A1"
   max_tasks_per_node  = 2
   node_agent_sku_id   = "batch.node.ubuntu 16.04"
-  
+
   fixed_scale {
     target_dedicated_nodes = 2
   }
-  
+
   storage_image_reference {
     publisher = "Canonical"
     offer     = "UbuntuServer"
@@ -510,7 +510,8 @@ resource "azurerm_batch_pool" "test" {
 
   auto_scale {
     evaluation_interval = "PT15M"
-    formula             = <<EOF
+
+    formula = <<EOF
       startingNumberOfVMs = 1;
       maxNumberofVMs = 25;
       pendingTaskSamplePercent = $PendingTasks.GetSamplePercent(180 * TimeInterval_Second);
@@ -625,7 +626,7 @@ resource "azurerm_batch_pool" "test" {
     wait_for_success     = true
 
     environment = {
-      env = "TEST",
+      env = "TEST"
       bu  = "Research&Dev"
     }
 
@@ -682,7 +683,7 @@ resource "azurerm_batch_pool" "test" {
     wait_for_success     = true
 
     environment = {
-      env = "TEST",
+      env = "TEST"
       bu  = "Research&Dev"
     }
 
@@ -740,7 +741,7 @@ resource "azurerm_batch_pool" "test" {
     wait_for_success     = true
 
     environment = {
-      env = "TEST",
+      env = "TEST"
       bu  = "Research&Dev"
     }
 
@@ -753,8 +754,8 @@ resource "azurerm_batch_pool" "test" {
 
     resource_file {
       auto_storage_container_name = "test"
-      http_url  = "test"
-      file_path = "README.md"
+      http_url                    = "test"
+      file_path                   = "README.md"
     }
   }
 }
@@ -798,7 +799,7 @@ resource "azurerm_batch_pool" "test" {
     wait_for_success     = true
 
     environment = {
-      env = "TEST",
+      env = "TEST"
       bu  = "Research&Dev"
     }
 
@@ -856,7 +857,7 @@ resource "azurerm_batch_pool" "test" {
     wait_for_success     = true
 
     environment = {
-      env = "TEST",
+      env = "TEST"
       bu  = "Research&Dev"
     }
 
@@ -890,23 +891,24 @@ resource "azurerm_batch_account" "test" {
 }
 
 resource "azurerm_batch_certificate" "testcer" {
-	resource_group_name  = "${azurerm_resource_group.test.name}"
-	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${filebase64("testdata/batch_certificate.cer")}"
-	format               = "Cer"
-	thumbprint           = "312d31a79fa0cef49c00f769afc2b73e9f4edf34" # deliberately using lowercase here as verification
-	thumbprint_algorithm = "SHA1"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  account_name         = "${azurerm_batch_account.test.name}"
+  certificate          = "${filebase64("testdata/batch_certificate.cer")}"
+  format               = "Cer"
+  thumbprint           = "312d31a79fa0cef49c00f769afc2b73e9f4edf34"        # deliberately using lowercase here as verification
+  thumbprint_algorithm = "SHA1"
 }
+
 resource "azurerm_batch_certificate" "testpfx" {
-	resource_group_name  = "${azurerm_resource_group.test.name}"
-	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${filebase64("testdata/batch_certificate.pfx")}"
-	format               = "Pfx"
-	password             = "terraform"
-	thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
-	thumbprint_algorithm = "SHA1"
-}
-	
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  account_name         = "${azurerm_batch_account.test.name}"
+  certificate          = "${filebase64("testdata/batch_certificate.pfx")}"
+  format               = "Pfx"
+  password             = "terraform"
+  thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
+  thumbprint_algorithm = "SHA1"
+}
+
 resource "azurerm_batch_pool" "test" {
   name                = "testaccpool%s"
   resource_group_name = "${azurerm_resource_group.test.name}"
@@ -928,16 +930,15 @@ resource "azurerm_batch_pool" "test" {
   certificate {
     id             = "${azurerm_batch_certificate.testcer.id}"
     store_location = "CurrentUser"
-    visibility     = [ "StartTask" ]
+    visibility     = ["StartTask"]
   }
 
   certificate {
     id             = "${azurerm_batch_certificate.testpfx.id}"
     store_location = "CurrentUser"
-    visibility     = [ "StartTask", "RemoteUser" ]
+    visibility     = ["StartTask", "RemoteUser"]
   }
 }
-
 `, rInt, location, rString, rString)
 }
 
@@ -983,6 +984,5 @@ resource "azurerm_batch_pool" "test" {
     type = "DockerCompatible"
   }
 }
-
 `, rInt, location, rString, rString, rString)
 }
diff --git a/azurerm/resource_arm_connection_monitor_test.go b/azurerm/resource_arm_connection_monitor_test.go
index ad50b7fd3ad7..32c2de0e7682 100644
--- a/azurerm/resource_arm_connection_monitor_test.go
+++ b/azurerm/resource_arm_connection_monitor_test.go
@@ -523,7 +523,7 @@ resource "azurerm_connection_monitor" "test" {
 
   destination {
     address = "terraform.io"
-    port = 80
+    port    = 80
   }
 
   depends_on = ["azurerm_virtual_machine_extension.src"]
@@ -662,9 +662,9 @@ resource "azurerm_connection_monitor" "test" {
   }
 
   destination {
-		address            = "terraform.io"
-		virtual_machine_id = "${azurerm_virtual_machine.src.id}"
-		port               = 80
+    address            = "terraform.io"
+    virtual_machine_id = "${azurerm_virtual_machine.src.id}"
+    port               = 80
   }
 
   depends_on = ["azurerm_virtual_machine_extension.src"]
@@ -689,7 +689,7 @@ resource "azurerm_connection_monitor" "import" {
 
   destination {
     address = "terraform.io"
-    port = 80
+    port    = 80
   }
 
   depends_on = ["azurerm_virtual_machine_extension.src"]
diff --git a/azurerm/resource_arm_container_group_test.go b/azurerm/resource_arm_container_group_test.go
index 8955e49fc81a..7569a0efa550 100755
--- a/azurerm/resource_arm_container_group_test.go
+++ b/azurerm/resource_arm_container_group_test.go
@@ -478,9 +478,9 @@ resource "azurerm_container_group" "test" {
     port   = 80
   }
 
-	identity {
-		type = "SystemAssigned"
-	}
+  identity {
+    type = "SystemAssigned"
+  }
 
   tags = {
     environment = "Testing"
@@ -522,7 +522,7 @@ resource "azurerm_container_group" "test" {
     type         = "UserAssigned"
     identity_ids = ["${azurerm_user_assigned_identity.test.id}"]
   }
-	
+
   tags = {
     environment = "Testing"
   }
@@ -563,7 +563,7 @@ resource "azurerm_container_group" "test" {
     type         = "SystemAssigned, UserAssigned"
     identity_ids = ["${azurerm_user_assigned_identity.test.id}"]
   }
-	
+
   tags = {
     environment = "Testing"
   }
@@ -695,7 +695,8 @@ resource "azurerm_container_group" "test" {
     image  = "microsoft/aci-helloworld:latest"
     cpu    = "0.5"
     memory = "0.5"
-    ports  {
+
+    ports {
       port = 80
     }
   }
@@ -739,9 +740,11 @@ resource "azurerm_container_group" "test" {
     image  = "microsoft/aci-helloworld:latest"
     cpu    = "0.5"
     memory = "0.5"
-    ports  {
-      port     = 80
+
+    ports {
+      port = 80
     }
+
     ports {
       port     = 5443
       protocol = "UDP"
@@ -781,10 +784,12 @@ resource "azurerm_container_group" "test" {
     image  = "microsoft/iis:windowsservercore"
     cpu    = "2.0"
     memory = "3.5"
+
     ports {
       port     = 80
       protocol = "TCP"
     }
+
     ports {
       port     = 443
       protocol = "TCP"
@@ -839,6 +844,7 @@ resource "azurerm_container_group" "test" {
     image  = "microsoft/iis:windowsservercore"
     cpu    = "2.0"
     memory = "3.5"
+
     ports {
       port     = 80
       protocol = "TCP"
@@ -855,12 +861,12 @@ resource "azurerm_container_group" "test" {
     }
 
     readiness_probe {
-      exec                 = ["cat","/tmp/healthy"]
+      exec                  = ["cat", "/tmp/healthy"]
       initial_delay_seconds = 1
-      period_seconds       = 1
-      failure_threshold   = 1
-      success_threshold    = 1
-      timeout_seconds      = 1
+      period_seconds        = 1
+      failure_threshold     = 1
+      success_threshold     = 1
+      timeout_seconds       = 1
     }
 
     liveness_probe {
@@ -869,11 +875,12 @@ resource "azurerm_container_group" "test" {
         port   = 443
         scheme = "Http"
       }
+
       initial_delay_seconds = 1
-      period_seconds       = 1
-      failure_threshold   = 1
-      success_threshold    = 1
-      timeout_seconds      = 1
+      period_seconds        = 1
+      failure_threshold     = 1
+      success_threshold     = 1
+      timeout_seconds       = 1
     }
 
     commands = ["cmd.exe", "echo", "hi"]
@@ -884,6 +891,7 @@ resource "azurerm_container_group" "test" {
       workspace_id  = "${azurerm_log_analytics_workspace.test.workspace_id}"
       workspace_key = "${azurerm_log_analytics_workspace.test.primary_shared_key}"
       log_type      = "ContainerInsights"
+
       metadata = {
         node-name = "acctestContainerGroup"
       }
@@ -963,7 +971,7 @@ resource "azurerm_container_group" "test" {
 
     gpu {
       count = 1
-      sku = "K80"
+      sku   = "K80"
     }
 
     volume {
@@ -973,7 +981,7 @@ resource "azurerm_container_group" "test" {
       share_name = "${azurerm_storage_share.test.name}"
 
       storage_account_name = "${azurerm_storage_account.test.name}"
-      storage_account_key = "${azurerm_storage_account.test.primary_access_key}"
+      storage_account_key  = "${azurerm_storage_account.test.primary_access_key}"
     }
 
     environment_variables = {
@@ -987,12 +995,12 @@ resource "azurerm_container_group" "test" {
     }
 
     readiness_probe {
-      exec                 = ["cat","/tmp/healthy"]
+      exec                  = ["cat", "/tmp/healthy"]
       initial_delay_seconds = 1
-      period_seconds       = 1
-      failure_threshold   = 1
-      success_threshold    = 1
-      timeout_seconds      = 1
+      period_seconds        = 1
+      failure_threshold     = 1
+      success_threshold     = 1
+      timeout_seconds       = 1
     }
 
     liveness_probe {
@@ -1001,21 +1009,23 @@ resource "azurerm_container_group" "test" {
         port   = 443
         scheme = "Http"
       }
+
       initial_delay_seconds = 1
-      period_seconds       = 1
-      failure_threshold   = 1
-      success_threshold    = 1
-      timeout_seconds      = 1
+      period_seconds        = 1
+      failure_threshold     = 1
+      success_threshold     = 1
+      timeout_seconds       = 1
     }
 
     commands = ["/bin/bash", "-c", "ls"]
   }
 
   diagnostics {
-     log_analytics {
+    log_analytics {
       workspace_id  = "${azurerm_log_analytics_workspace.test.workspace_id}"
       workspace_key = "${azurerm_log_analytics_workspace.test.primary_shared_key}"
       log_type      = "ContainerInsights"
+
       metadata = {
         node-name = "acctestContainerGroup"
       }
diff --git a/azurerm/resource_arm_data_factory_dataset_mysql_test.go b/azurerm/resource_arm_data_factory_dataset_mysql_test.go
index a3c8bdb490ea..3310cc39b81f 100644
--- a/azurerm/resource_arm_data_factory_dataset_mysql_test.go
+++ b/azurerm/resource_arm_data_factory_dataset_mysql_test.go
@@ -190,7 +190,7 @@ resource "azurerm_data_factory_dataset_mysql" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   data_factory_name   = "${azurerm_data_factory.test.name}"
   linked_service_name = "${azurerm_data_factory_linked_service_mysql.test.name}"
- 
+
   description = "test description"
   annotations = ["test1", "test2", "test3"]
   table_name  = "testTable"
@@ -200,12 +200,12 @@ resource "azurerm_data_factory_dataset_mysql" "test" {
     foo = "test1"
     bar = "test2"
   }
- 
+
   additional_properties = {
     foo = "test1"
     bar = "test2"
   }
-	
+
   schema_column {
     name        = "test1"
     type        = "Byte"
@@ -240,7 +240,7 @@ resource "azurerm_data_factory_dataset_mysql" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   data_factory_name   = "${azurerm_data_factory.test.name}"
   linked_service_name = "${azurerm_data_factory_linked_service_mysql.test.name}"
- 
+
   description = "test description 2"
   annotations = ["test1", "test2"]
   table_name  = "testTable"
@@ -251,17 +251,17 @@ resource "azurerm_data_factory_dataset_mysql" "test" {
     bar  = "test2"
     buzz = "test3"
   }
- 
+
   additional_properties = {
     foo = "test1"
   }
-	
+
   schema_column {
     name        = "test1"
     type        = "Byte"
     description = "description"
   }
-	
+
   schema_column {
     name        = "test2"
     type        = "Byte"
diff --git a/azurerm/resource_arm_data_factory_dataset_postgresql_test.go b/azurerm/resource_arm_data_factory_dataset_postgresql_test.go
index 93ac6fc94c4c..39769f102798 100644
--- a/azurerm/resource_arm_data_factory_dataset_postgresql_test.go
+++ b/azurerm/resource_arm_data_factory_dataset_postgresql_test.go
@@ -190,7 +190,7 @@ resource "azurerm_data_factory_dataset_postgresql" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   data_factory_name   = "${azurerm_data_factory.test.name}"
   linked_service_name = "${azurerm_data_factory_linked_service_postgresql.test.name}"
- 
+
   description = "test description"
   annotations = ["test1", "test2", "test3"]
   table_name  = "testTable"
@@ -200,12 +200,12 @@ resource "azurerm_data_factory_dataset_postgresql" "test" {
     foo = "test1"
     bar = "test2"
   }
- 
+
   additional_properties = {
     foo = "test1"
     bar = "test2"
   }
-	
+
   schema_column {
     name        = "test1"
     type        = "Byte"
@@ -240,7 +240,7 @@ resource "azurerm_data_factory_dataset_postgresql" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   data_factory_name   = "${azurerm_data_factory.test.name}"
   linked_service_name = "${azurerm_data_factory_linked_service_postgresql.test.name}"
- 
+
   description = "test description 2"
   annotations = ["test1", "test2"]
   table_name  = "testTable"
@@ -251,17 +251,17 @@ resource "azurerm_data_factory_dataset_postgresql" "test" {
     bar  = "test2"
     buzz = "test3"
   }
- 
+
   additional_properties = {
     foo = "test1"
   }
-	
+
   schema_column {
     name        = "test1"
     type        = "Byte"
     description = "description"
   }
-	
+
   schema_column {
     name        = "test2"
     type        = "Byte"
diff --git a/azurerm/resource_arm_data_factory_dataset_sql_server_table_test.go b/azurerm/resource_arm_data_factory_dataset_sql_server_table_test.go
index a7702a62c3a6..e326eeb145d6 100644
--- a/azurerm/resource_arm_data_factory_dataset_sql_server_table_test.go
+++ b/azurerm/resource_arm_data_factory_dataset_sql_server_table_test.go
@@ -190,7 +190,7 @@ resource "azurerm_data_factory_dataset_sql_server_table" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   data_factory_name   = "${azurerm_data_factory.test.name}"
   linked_service_name = "${azurerm_data_factory_linked_service_sql_server.test.name}"
- 
+
   description = "test description"
   annotations = ["test1", "test2", "test3"]
   table_name  = "testTable"
@@ -200,12 +200,12 @@ resource "azurerm_data_factory_dataset_sql_server_table" "test" {
     foo = "test1"
     bar = "test2"
   }
- 
+
   additional_properties = {
     foo = "test1"
     bar = "test2"
   }
-	
+
   schema_column {
     name        = "test1"
     type        = "Byte"
@@ -240,28 +240,28 @@ resource "azurerm_data_factory_dataset_sql_server_table" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   data_factory_name   = "${azurerm_data_factory.test.name}"
   linked_service_name = "${azurerm_data_factory_linked_service_sql_server.test.name}"
- 
+
   description = "test description 2"
   annotations = ["test1", "test2"]
   table_name  = "testTable"
   folder      = "testFolder"
 
   parameters = {
-    foo = "test1"
-    bar = "test2"
+    foo  = "test1"
+    bar  = "test2"
     buzz = "test3"
   }
- 
+
   additional_properties = {
     foo = "test1"
   }
-	
+
   schema_column {
     name        = "test1"
     type        = "Byte"
     description = "description"
   }
-	
+
   schema_column {
     name        = "test2"
     type        = "Byte"
diff --git a/azurerm/resource_arm_data_factory_linked_service_data_lake_storage_gen2_test.go b/azurerm/resource_arm_data_factory_linked_service_data_lake_storage_gen2_test.go
index 6be633e51495..192ceb805cbd 100644
--- a/azurerm/resource_arm_data_factory_linked_service_data_lake_storage_gen2_test.go
+++ b/azurerm/resource_arm_data_factory_linked_service_data_lake_storage_gen2_test.go
@@ -233,8 +233,8 @@ resource "azurerm_data_factory_linked_service_data_lake_storage_gen2" "test" {
   description           = "test description 2"
 
   parameters = {
-    foo = "test1"
-    bar = "test2"
+    foo  = "test1"
+    bar  = "test2"
     buzz = "test3"
   }
 
diff --git a/azurerm/resource_arm_data_factory_linked_service_mysql_test.go b/azurerm/resource_arm_data_factory_linked_service_mysql_test.go
index bdd1d5e92935..c1ecb670b949 100644
--- a/azurerm/resource_arm_data_factory_linked_service_mysql_test.go
+++ b/azurerm/resource_arm_data_factory_linked_service_mysql_test.go
@@ -220,8 +220,8 @@ resource "azurerm_data_factory_linked_service_mysql" "test" {
   description         = "test description 2"
 
   parameters = {
-    foo = "test1"
-    bar = "test2"
+    foo  = "test1"
+    bar  = "test2"
     buzz = "test3"
   }
 
diff --git a/azurerm/resource_arm_data_factory_linked_service_postgresql_test.go b/azurerm/resource_arm_data_factory_linked_service_postgresql_test.go
index 7cd9aa366b2e..22ec38f661d9 100644
--- a/azurerm/resource_arm_data_factory_linked_service_postgresql_test.go
+++ b/azurerm/resource_arm_data_factory_linked_service_postgresql_test.go
@@ -220,8 +220,8 @@ resource "azurerm_data_factory_linked_service_postgresql" "test" {
   description         = "test description 2"
 
   parameters = {
-    foo = "test1"
-    bar = "test2"
+    foo  = "test1"
+    bar  = "test2"
     buzz = "test3"
   }
 
diff --git a/azurerm/resource_arm_data_factory_linked_service_sql_server_test.go b/azurerm/resource_arm_data_factory_linked_service_sql_server_test.go
index c55d9736a4f2..6ea40b5cf842 100644
--- a/azurerm/resource_arm_data_factory_linked_service_sql_server_test.go
+++ b/azurerm/resource_arm_data_factory_linked_service_sql_server_test.go
@@ -167,8 +167,8 @@ resource "azurerm_data_factory_linked_service_sql_server" "test" {
   description         = "test description 2"
 
   parameters = {
-    foo = "test1"
-    bar = "test2"
+    foo  = "test1"
+    bar  = "test2"
     buzz = "test3"
   }
 
diff --git a/azurerm/resource_arm_data_factory_pipeline_test.go b/azurerm/resource_arm_data_factory_pipeline_test.go
index 9516f792317b..8c587ffe068e 100644
--- a/azurerm/resource_arm_data_factory_pipeline_test.go
+++ b/azurerm/resource_arm_data_factory_pipeline_test.go
@@ -171,7 +171,7 @@ resource "azurerm_data_factory_pipeline" "test" {
   parameters = {
     test = "testparameter"
   }
-	
+
   variables = {
     foo = "test1"
     bar = "test2"
@@ -199,9 +199,9 @@ resource "azurerm_data_factory_pipeline" "test" {
   data_factory_name   = "${azurerm_data_factory.test.name}"
   annotations         = ["test1", "test2"]
   description         = "test description2"
-	
+
   parameters = {
-    test = "testparameter"
+    test  = "testparameter"
     test2 = "testparameter2"
   }
 
diff --git a/azurerm/resource_arm_data_factory_test.go b/azurerm/resource_arm_data_factory_test.go
index d64c0f17c833..630127c4d148 100644
--- a/azurerm/resource_arm_data_factory_test.go
+++ b/azurerm/resource_arm_data_factory_test.go
@@ -279,118 +279,119 @@ func testCheckAzureRMDataFactoryDestroy(s *terraform.State) error {
 
 func testAccAzureRMDataFactory_basic(rInt int, location string) string {
 	return fmt.Sprintf(`
-  resource "azurerm_resource_group" "test" {
-    name     = "acctestRG-%d"
-    location = "%s"
-  }
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%d"
+  location = "%s"
+}
 
-  resource "azurerm_data_factory" "test" {
-    name                = "acctestdf%d"
-    location            = "${azurerm_resource_group.test.location}"
-    resource_group_name = "${azurerm_resource_group.test.name}"
-  }
+resource "azurerm_data_factory" "test" {
+  name                = "acctestdf%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+}
 `, rInt, location, rInt)
 }
 
 func testAccAzureRMDataFactory_tags(rInt int, location string) string {
 	return fmt.Sprintf(`
-  resource "azurerm_resource_group" "test" {
-    name     = "acctestRG-%d"
-    location = "%s"
-  }
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%d"
+  location = "%s"
+}
 
-  resource "azurerm_data_factory" "test" {
-    name                = "acctestdf%d"
-    location            = "${azurerm_resource_group.test.location}"
-    resource_group_name = "${azurerm_resource_group.test.name}"
+resource "azurerm_data_factory" "test" {
+  name                = "acctestdf%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 
-    tags = {
-      environment = "production"
-    }
+  tags = {
+    environment = "production"
   }
+}
 `, rInt, location, rInt)
 }
 
 func testAccAzureRMDataFactory_tagsUpdated(rInt int, location string) string {
 	return fmt.Sprintf(`
-  resource "azurerm_resource_group" "test" {
-    name     = "acctestRG-%d"
-    location = "%s"
-  }
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%d"
+  location = "%s"
+}
 
-  resource "azurerm_data_factory" "test" {
-    name                = "acctestdf%d"
-    location            = "${azurerm_resource_group.test.location}"
-    resource_group_name = "${azurerm_resource_group.test.name}"
+resource "azurerm_data_factory" "test" {
+  name                = "acctestdf%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 
-    tags = {
-      environment = "production"
-      updated     = "true"
-    }
+  tags = {
+    environment = "production"
+    updated     = "true"
   }
+}
 `, rInt, location, rInt)
 }
 
 func testAccAzureRMDataFactory_identity(rInt int, location string) string {
 	return fmt.Sprintf(`
-  resource "azurerm_resource_group" "test" {
-    name     = "acctestRG-%d"
-    location = "%s"
-  }
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%d"
+  location = "%s"
+}
+
+resource "azurerm_data_factory" "test" {
+  name                = "acctestdf%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 
-  resource "azurerm_data_factory" "test" {
-    name                = "acctestdf%d"
-    location            = "${azurerm_resource_group.test.location}"
-    resource_group_name = "${azurerm_resource_group.test.name}"
-    
-    identity {
-      type = "SystemAssigned"
-    }
+  identity {
+    type = "SystemAssigned"
   }
+}
 `, rInt, location, rInt)
 }
 
 func testAccAzureRMDataFactory_github(rInt int, location string) string {
 	return fmt.Sprintf(`
-  resource "azurerm_resource_group" "test" {
-    name     = "acctestRG-%d"
-    location = "%s"
-  }
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%d"
+  location = "%s"
+}
 
-  resource "azurerm_data_factory" "test" {
-    name                = "acctestdf%d"
-    location            = "${azurerm_resource_group.test.location}"
-    resource_group_name = "${azurerm_resource_group.test.name}"
-		
-    github_configuration {
-      git_url         = "https://github.com/terraform-providers/"
-      repository_name = "terraform-provider-azurerm"
-      branch_name     = "master"
-      root_folder     = "/"
-      account_name    = "acctestGH-%d"
-    }
+resource "azurerm_data_factory" "test" {
+  name                = "acctestdf%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+
+  github_configuration {
+    git_url         = "https://github.com/terraform-providers/"
+    repository_name = "terraform-provider-azurerm"
+    branch_name     = "master"
+    root_folder     = "/"
+    account_name    = "acctestGH-%d"
   }
+}
 `, rInt, location, rInt, rInt)
 }
 
 func testAccAzureRMDataFactory_githubUpdated(rInt int, location string) string {
 	return fmt.Sprintf(`
-  resource "azurerm_resource_group" "test" {
-    name     = "acctestRG-%d"
-    location = "%s"
-  }
-  resource "azurerm_data_factory" "test" {
-    name                = "acctestdf%d"
-    location            = "${azurerm_resource_group.test.location}"
-    resource_group_name = "${azurerm_resource_group.test.name}"
-		
-    github_configuration {
-      git_url         = "https://github.com/terraform-providers/"
-      repository_name = "terraform-provider-azuread"
-      branch_name     = "stable-website"
-      root_folder     = "/azuread"
-      account_name    = "acctestGitHub-%d"
-    }
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%d"
+  location = "%s"
+}
+
+resource "azurerm_data_factory" "test" {
+  name                = "acctestdf%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+
+  github_configuration {
+    git_url         = "https://github.com/terraform-providers/"
+    repository_name = "terraform-provider-azuread"
+    branch_name     = "stable-website"
+    root_folder     = "/azuread"
+    account_name    = "acctestGitHub-%d"
   }
+}
 `, rInt, location, rInt, rInt)
 }
diff --git a/azurerm/resource_arm_eventgrid_domain_test.go b/azurerm/resource_arm_eventgrid_domain_test.go
index ab7440f0fddf..2670641374fe 100644
--- a/azurerm/resource_arm_eventgrid_domain_test.go
+++ b/azurerm/resource_arm_eventgrid_domain_test.go
@@ -179,14 +179,15 @@ resource "azurerm_eventgrid_domain" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
 
   input_schema = "CustomEventSchema"
+
   input_mapping_fields {
-	topic      = "test"
-	event_type = "test"
+    topic      = "test"
+    event_type = "test"
   }
 
   input_mapping_default_values {
-	data_version = "1.0"
-	subject      = "DefaultSubject"
+    data_version = "1.0"
+    subject      = "DefaultSubject"
   }
 }
 `, rInt, location, rInt)
diff --git a/azurerm/resource_arm_eventgrid_event_subscription_test.go b/azurerm/resource_arm_eventgrid_event_subscription_test.go
index dcd39753a607..5a57033d436b 100644
--- a/azurerm/resource_arm_eventgrid_event_subscription_test.go
+++ b/azurerm/resource_arm_eventgrid_event_subscription_test.go
@@ -221,12 +221,12 @@ resource "azurerm_storage_account" "test" {
   location                 = "${azurerm_resource_group.test.location}"
   account_tier             = "Standard"
   account_replication_type = "LRS"
-  
+
   tags = {
     environment = "staging"
   }
 }
-  
+
 resource "azurerm_storage_queue" "test" {
   name                 = "mysamplequeue-%d"
   resource_group_name  = "${azurerm_resource_group.test.name}"
@@ -252,21 +252,22 @@ resource "azurerm_storage_blob" "test" {
 }
 
 resource "azurerm_eventgrid_event_subscription" "test" {
-  name                = "acctesteg-%d"
+  name  = "acctesteg-%d"
   scope = "${azurerm_resource_group.test.id}"
+
   storage_queue_endpoint {
-	  storage_account_id = "${azurerm_storage_account.test.id}"
-	  queue_name = "${azurerm_storage_queue.test.name}"
+    storage_account_id = "${azurerm_storage_account.test.id}"
+    queue_name         = "${azurerm_storage_queue.test.name}"
   }
 
   storage_blob_dead_letter_destination {
-	  storage_account_id = "${azurerm_storage_account.test.id}"
-	  storage_blob_container_name = "${azurerm_storage_container.test.name}"
+    storage_account_id          = "${azurerm_storage_account.test.id}"
+    storage_blob_container_name = "${azurerm_storage_container.test.name}"
   }
 
   retry_policy {
-	  event_time_to_live = 11
-	  max_delivery_attempts = 11
+    event_time_to_live    = 11
+    max_delivery_attempts = 11
   }
 
   labels = ["test", "test1", "test2"]
@@ -287,12 +288,12 @@ resource "azurerm_storage_account" "test" {
   location                 = "${azurerm_resource_group.test.location}"
   account_tier             = "Standard"
   account_replication_type = "LRS"
-  
+
   tags = {
     environment = "staging"
   }
 }
-  
+
 resource "azurerm_storage_queue" "test" {
   name                 = "mysamplequeue-%d"
   resource_group_name  = "${azurerm_resource_group.test.name}"
@@ -318,30 +319,31 @@ resource "azurerm_storage_blob" "test" {
 }
 
 resource "azurerm_eventgrid_event_subscription" "test" {
-  name                = "acctesteg-%d"
+  name  = "acctesteg-%d"
   scope = "${azurerm_resource_group.test.id}"
+
   storage_queue_endpoint {
-	  storage_account_id = "${azurerm_storage_account.test.id}"
-	  queue_name = "${azurerm_storage_queue.test.name}"
+    storage_account_id = "${azurerm_storage_account.test.id}"
+    queue_name         = "${azurerm_storage_queue.test.name}"
   }
 
   storage_blob_dead_letter_destination {
-	  storage_account_id = "${azurerm_storage_account.test.id}"
-	  storage_blob_container_name = "${azurerm_storage_container.test.name}"
+    storage_account_id          = "${azurerm_storage_account.test.id}"
+    storage_blob_container_name = "${azurerm_storage_container.test.name}"
   }
 
   retry_policy {
-	  event_time_to_live = 12
-	  max_delivery_attempts = 10
+    event_time_to_live    = 12
+    max_delivery_attempts = 10
   }
 
   subject_filter {
-	subject_begins_with = "test/test"
-	subject_ends_with = ".jpg"
+    subject_begins_with = "test/test"
+    subject_ends_with   = ".jpg"
   }
 
   included_event_types = ["Microsoft.Storage.BlobCreated", "Microsoft.Storage.BlobDeleted"]
-  labels = ["test4", "test5", "test6"]
+  labels               = ["test4", "test5", "test6"]
 }
 `, rInt, location, rString, rInt, rInt)
 }
@@ -369,11 +371,12 @@ resource "azurerm_eventhub" "test" {
 }
 
 resource "azurerm_eventgrid_event_subscription" "test" {
-  name                = "acctesteg-%d"
-  scope = "${azurerm_resource_group.test.id}"
+  name                  = "acctesteg-%d"
+  scope                 = "${azurerm_resource_group.test.id}"
   event_delivery_schema = "CloudEventV01Schema"
+
   eventhub_endpoint {
-	  eventhub_id = "${azurerm_eventhub.test.id}"
+    eventhub_id = "${azurerm_eventhub.test.id}"
   }
 }
 `, rInt, location, rInt, rInt, rInt)
@@ -392,12 +395,12 @@ resource "azurerm_storage_account" "test" {
   location                 = "${azurerm_resource_group.test.location}"
   account_tier             = "Standard"
   account_replication_type = "LRS"
-  
+
   tags = {
     environment = "staging"
   }
 }
-  
+
 resource "azurerm_storage_queue" "test" {
   name                 = "mysamplequeue-%d"
   resource_group_name  = "${azurerm_resource_group.test.name}"
@@ -405,18 +408,19 @@ resource "azurerm_storage_queue" "test" {
 }
 
 resource "azurerm_eventgrid_event_subscription" "test" {
-  name                = "acctesteg-%d"
+  name  = "acctesteg-%d"
   scope = "${azurerm_resource_group.test.id}"
+
   storage_queue_endpoint {
-	  storage_account_id = "${azurerm_storage_account.test.id}"
-	  queue_name = "${azurerm_storage_queue.test.name}"
+    storage_account_id = "${azurerm_storage_account.test.id}"
+    queue_name         = "${azurerm_storage_queue.test.name}"
   }
 
   included_event_types = ["Microsoft.Storage.BlobCreated", "Microsoft.Storage.BlobDeleted"]
 
   subject_filter {
-	  subject_begins_with = "test/test"
-	  subject_ends_with = ".jpg"
+    subject_begins_with = "test/test"
+    subject_ends_with   = ".jpg"
   }
 }
 `, rInt, location, rString, rInt, rInt)
diff --git a/azurerm/resource_arm_firewall_application_rule_collection_test.go b/azurerm/resource_arm_firewall_application_rule_collection_test.go
index b243439b0329..8275b2f1da91 100644
--- a/azurerm/resource_arm_firewall_application_rule_collection_test.go
+++ b/azurerm/resource_arm_firewall_application_rule_collection_test.go
@@ -843,6 +843,7 @@ resource "azurerm_firewall_application_rule_collection" "test" {
       port = 9000
       type = "Https"
     }
+
     protocol {
       port = 9001
       type = "Http"
diff --git a/azurerm/resource_arm_firewall_nat_rule_collection_test.go b/azurerm/resource_arm_firewall_nat_rule_collection_test.go
index 83f4a7287363..608aea72b3a0 100644
--- a/azurerm/resource_arm_firewall_nat_rule_collection_test.go
+++ b/azurerm/resource_arm_firewall_nat_rule_collection_test.go
@@ -429,10 +429,10 @@ resource "azurerm_firewall_nat_rule_collection" "test" {
 
     protocols = [
       "Any",
-		]
-		
-		translated_port = 53
-		translated_address = "8.8.8.8"
+    ]
+
+    translated_port    = 53
+    translated_address = "8.8.8.8"
   }
 }
 `, template, rInt)
@@ -467,10 +467,10 @@ resource "azurerm_firewall_nat_rule_collection" "import" {
 
     protocols = [
       "Any",
-		]
-		
-		translated_port = 53
-		translated_address = "8.8.8.8"
+    ]
+
+    translated_port    = 53
+    translated_address = "8.8.8.8"
   }
 }
 `, template)
@@ -505,10 +505,10 @@ resource "azurerm_firewall_nat_rule_collection" "test" {
 
     protocols = [
       "TCP",
-		]
+    ]
 
-		translated_port = 53
-		translated_address = "8.8.8.8"
+    translated_port    = 53
+    translated_address = "8.8.8.8"
   }
 }
 `, template, rInt)
@@ -543,10 +543,10 @@ resource "azurerm_firewall_nat_rule_collection" "test" {
 
     protocols = [
       "TCP",
-		]
-		
-		translated_port = 53
-		translated_address = "8.8.8.8"
+    ]
+
+    translated_port    = 53
+    translated_address = "8.8.8.8"
   }
 }
 
@@ -574,10 +574,10 @@ resource "azurerm_firewall_nat_rule_collection" "test_add" {
 
     protocols = [
       "TCP",
-		]
-		
-		translated_port = 8080
-		translated_address = "8.8.4.4"
+    ]
+
+    translated_port    = 8080
+    translated_address = "8.8.4.4"
   }
 }
 `, template, rInt, rInt)
@@ -612,10 +612,10 @@ resource "azurerm_firewall_nat_rule_collection" "test" {
 
     protocols = [
       "TCP",
-		]
-		
-		translated_port = 53
-		translated_address = "10.0.0.1"
+    ]
+
+    translated_port    = 53
+    translated_address = "10.0.0.1"
   }
 }
 
@@ -643,10 +643,10 @@ resource "azurerm_firewall_nat_rule_collection" "test_add" {
 
     protocols = [
       "TCP",
-		]
-		
-		translated_port = 8080
-		translated_address = "10.0.0.1"
+    ]
+
+    translated_port    = 8080
+    translated_address = "10.0.0.1"
   }
 }
 `, template, rInt, rInt)
@@ -681,10 +681,10 @@ resource "azurerm_firewall_nat_rule_collection" "test" {
 
     protocols = [
       "TCP",
-		]
-		
-		translated_port = 53
-		translated_address = "10.0.0.1"
+    ]
+
+    translated_port    = 53
+    translated_address = "10.0.0.1"
   }
 
   rule {
@@ -704,10 +704,10 @@ resource "azurerm_firewall_nat_rule_collection" "test" {
 
     protocols = [
       "TCP",
-		]
-		
-		translated_port = 8888
-		translated_address = "192.168.0.1"
+    ]
+
+    translated_port    = 8888
+    translated_address = "192.168.0.1"
   }
 }
 `, template, rInt)
@@ -742,10 +742,10 @@ resource "azurerm_firewall_nat_rule_collection" "test" {
 
     protocols = [
       "TCP",
-		]
-		
-		translated_port = 53
-		translated_address = "10.0.0.1"
+    ]
+
+    translated_port    = 53
+    translated_address = "10.0.0.1"
   }
 }
 `, template, rInt)
diff --git a/azurerm/resource_arm_function_app_test.go b/azurerm/resource_arm_function_app_test.go
index d56ca91ce42f..863472b05bd9 100644
--- a/azurerm/resource_arm_function_app_test.go
+++ b/azurerm/resource_arm_function_app_test.go
@@ -1000,7 +1000,7 @@ resource "azurerm_function_app" "test" {
   resource_group_name       = "${azurerm_resource_group.test.name}"
   app_service_plan_id       = "${azurerm_app_service_plan.test.id}"
   storage_connection_string = "${azurerm_storage_account.test.primary_connection_string}"
-  
+
   site_config {
     linux_fx_version = "DOCKER|(golang:latest)"
   }
@@ -1130,7 +1130,7 @@ resource "azurerm_function_app" "test" {
   resource_group_name       = "${azurerm_resource_group.test.name}"
   app_service_plan_id       = "${azurerm_app_service_plan.test.id}"
   storage_connection_string = "${azurerm_storage_account.test.primary_connection_string}"
-  
+
   app_settings = {
     "hello" = "world"
   }
@@ -1179,7 +1179,7 @@ resource "azurerm_function_app" "test" {
   resource_group_name       = "${azurerm_resource_group.test.name}"
   app_service_plan_id       = "${azurerm_app_service_plan.test.id}"
   storage_connection_string = "${azurerm_storage_account.test.primary_connection_string}"
-  
+
   app_settings = {
     "hello" = "world"
   }
diff --git a/azurerm/resource_arm_hdinsight_hadoop_cluster_test.go b/azurerm/resource_arm_hdinsight_hadoop_cluster_test.go
index c47a878ed337..240ba0be140b 100644
--- a/azurerm/resource_arm_hdinsight_hadoop_cluster_test.go
+++ b/azurerm/resource_arm_hdinsight_hadoop_cluster_test.go
@@ -356,20 +356,20 @@ resource "azurerm_hdinsight_hadoop_cluster" "test" {
     head_node {
       vm_size  = "Standard_D3_v2"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
 
     worker_node {
       vm_size               = "Standard_D4_v2"
       username              = "acctestusrvm"
-      ssh_keys              = [ "${var.ssh_key}" ]
+      ssh_keys              = ["${var.ssh_key}"]
       target_instance_count = 3
     }
 
     zookeeper_node {
       vm_size  = "Standard_D3_v2"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
   }
 }
@@ -450,6 +450,7 @@ resource "azurerm_subnet" "test" {
   virtual_network_name = "${azurerm_virtual_network.test.name}"
   address_prefix       = "10.0.2.0/24"
 }
+
 resource "azurerm_hdinsight_hadoop_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
@@ -521,6 +522,7 @@ resource "azurerm_subnet" "test" {
   virtual_network_name = "${azurerm_virtual_network.test.name}"
   address_prefix       = "10.0.2.0/24"
 }
+
 resource "azurerm_hdinsight_hadoop_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
diff --git a/azurerm/resource_arm_hdinsight_hbase_cluster_test.go b/azurerm/resource_arm_hdinsight_hbase_cluster_test.go
index 163a16333c45..406ce6e38034 100644
--- a/azurerm/resource_arm_hdinsight_hbase_cluster_test.go
+++ b/azurerm/resource_arm_hdinsight_hbase_cluster_test.go
@@ -356,20 +356,20 @@ resource "azurerm_hdinsight_hbase_cluster" "test" {
     head_node {
       vm_size  = "Standard_D3_V2"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
 
     worker_node {
       vm_size               = "Standard_D3_V2"
       username              = "acctestusrvm"
-      ssh_keys              = [ "${var.ssh_key}" ]
+      ssh_keys              = ["${var.ssh_key}"]
       target_instance_count = 3
     }
 
     zookeeper_node {
       vm_size  = "Standard_D3_V2"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
   }
 }
@@ -450,6 +450,7 @@ resource "azurerm_subnet" "test" {
   virtual_network_name = "${azurerm_virtual_network.test.name}"
   address_prefix       = "10.0.2.0/24"
 }
+
 resource "azurerm_hdinsight_hbase_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
@@ -521,6 +522,7 @@ resource "azurerm_subnet" "test" {
   virtual_network_name = "${azurerm_virtual_network.test.name}"
   address_prefix       = "10.0.2.0/24"
 }
+
 resource "azurerm_hdinsight_hbase_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
diff --git a/azurerm/resource_arm_hdinsight_interactive_query_cluster_test.go b/azurerm/resource_arm_hdinsight_interactive_query_cluster_test.go
index 9638ccb7b4e9..a0e483ea7705 100644
--- a/azurerm/resource_arm_hdinsight_interactive_query_cluster_test.go
+++ b/azurerm/resource_arm_hdinsight_interactive_query_cluster_test.go
@@ -356,20 +356,20 @@ resource "azurerm_hdinsight_interactive_query_cluster" "test" {
     head_node {
       vm_size  = "Standard_D13_V2"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
 
     worker_node {
       vm_size               = "Standard_D14_V2"
       username              = "acctestusrvm"
-      ssh_keys              = [ "${var.ssh_key}" ]
+      ssh_keys              = ["${var.ssh_key}"]
       target_instance_count = 3
     }
 
     zookeeper_node {
       vm_size  = "Standard_A4_V2"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
   }
 }
diff --git a/azurerm/resource_arm_hdinsight_kafka_cluster_test.go b/azurerm/resource_arm_hdinsight_kafka_cluster_test.go
index 26f4cfd639ed..91bf0c37a964 100644
--- a/azurerm/resource_arm_hdinsight_kafka_cluster_test.go
+++ b/azurerm/resource_arm_hdinsight_kafka_cluster_test.go
@@ -357,13 +357,13 @@ resource "azurerm_hdinsight_kafka_cluster" "test" {
     head_node {
       vm_size  = "Standard_D3_V2"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
 
     worker_node {
       vm_size                  = "Standard_D3_V2"
       username                 = "acctestusrvm"
-      ssh_keys                 = [ "${var.ssh_key}" ]
+      ssh_keys                 = ["${var.ssh_key}"]
       target_instance_count    = 3
       number_of_disks_per_node = 2
     }
@@ -371,7 +371,7 @@ resource "azurerm_hdinsight_kafka_cluster" "test" {
     zookeeper_node {
       vm_size  = "Standard_D3_V2"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
   }
 }
@@ -453,6 +453,7 @@ resource "azurerm_subnet" "test" {
   virtual_network_name = "${azurerm_virtual_network.test.name}"
   address_prefix       = "10.0.2.0/24"
 }
+
 resource "azurerm_hdinsight_kafka_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
@@ -525,6 +526,7 @@ resource "azurerm_subnet" "test" {
   virtual_network_name = "${azurerm_virtual_network.test.name}"
   address_prefix       = "10.0.2.0/24"
 }
+
 resource "azurerm_hdinsight_kafka_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
diff --git a/azurerm/resource_arm_hdinsight_ml_services_cluster_test.go b/azurerm/resource_arm_hdinsight_ml_services_cluster_test.go
index a61d8f9101b4..dcd8615e51b1 100644
--- a/azurerm/resource_arm_hdinsight_ml_services_cluster_test.go
+++ b/azurerm/resource_arm_hdinsight_ml_services_cluster_test.go
@@ -374,26 +374,26 @@ resource "azurerm_hdinsight_ml_services_cluster" "test" {
     head_node {
       vm_size  = "Standard_D3_V2"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
 
     worker_node {
       vm_size               = "Standard_D3_V2"
       username              = "acctestusrvm"
-      ssh_keys              = [ "${var.ssh_key}" ]
+      ssh_keys              = ["${var.ssh_key}"]
       target_instance_count = 3
     }
 
     zookeeper_node {
       vm_size  = "Standard_D3_V2"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
 
     edge_node {
       vm_size  = "Standard_D3_V2"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
   }
 }
diff --git a/azurerm/resource_arm_hdinsight_rserver_cluster_test.go b/azurerm/resource_arm_hdinsight_rserver_cluster_test.go
index 58fb1be1094b..7b72b8a3dfa9 100644
--- a/azurerm/resource_arm_hdinsight_rserver_cluster_test.go
+++ b/azurerm/resource_arm_hdinsight_rserver_cluster_test.go
@@ -374,26 +374,26 @@ resource "azurerm_hdinsight_rserver_cluster" "test" {
     head_node {
       vm_size  = "Standard_D3_V2"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
 
     worker_node {
       vm_size               = "Standard_D3_V2"
       username              = "acctestusrvm"
-      ssh_keys              = [ "${var.ssh_key}" ]
+      ssh_keys              = ["${var.ssh_key}"]
       target_instance_count = 3
     }
 
     zookeeper_node {
       vm_size  = "Standard_D3_V2"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
 
     edge_node {
       vm_size  = "Standard_D3_V2"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
   }
 }
diff --git a/azurerm/resource_arm_hdinsight_spark_cluster_test.go b/azurerm/resource_arm_hdinsight_spark_cluster_test.go
index 0615882acf70..6a0414b4a144 100644
--- a/azurerm/resource_arm_hdinsight_spark_cluster_test.go
+++ b/azurerm/resource_arm_hdinsight_spark_cluster_test.go
@@ -356,20 +356,20 @@ resource "azurerm_hdinsight_spark_cluster" "test" {
     head_node {
       vm_size  = "Standard_A3"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
 
     worker_node {
       vm_size               = "Standard_A3"
       username              = "acctestusrvm"
-      ssh_keys              = [ "${var.ssh_key}" ]
+      ssh_keys              = ["${var.ssh_key}"]
       target_instance_count = 3
     }
 
     zookeeper_node {
       vm_size  = "Medium"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
   }
 }
@@ -450,6 +450,7 @@ resource "azurerm_subnet" "test" {
   virtual_network_name = "${azurerm_virtual_network.test.name}"
   address_prefix       = "10.0.2.0/24"
 }
+
 resource "azurerm_hdinsight_spark_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
@@ -521,6 +522,7 @@ resource "azurerm_subnet" "test" {
   virtual_network_name = "${azurerm_virtual_network.test.name}"
   address_prefix       = "10.0.2.0/24"
 }
+
 resource "azurerm_hdinsight_spark_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
diff --git a/azurerm/resource_arm_hdinsight_storm_cluster_test.go b/azurerm/resource_arm_hdinsight_storm_cluster_test.go
index ea63e5a59601..60c1045b86ea 100644
--- a/azurerm/resource_arm_hdinsight_storm_cluster_test.go
+++ b/azurerm/resource_arm_hdinsight_storm_cluster_test.go
@@ -356,20 +356,20 @@ resource "azurerm_hdinsight_storm_cluster" "test" {
     head_node {
       vm_size  = "Standard_A3"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
 
     worker_node {
       vm_size               = "Standard_D3_V2"
       username              = "acctestusrvm"
-      ssh_keys              = [ "${var.ssh_key}" ]
+      ssh_keys              = ["${var.ssh_key}"]
       target_instance_count = 3
     }
 
     zookeeper_node {
       vm_size  = "Standard_A4_V2"
       username = "acctestusrvm"
-      ssh_keys = [ "${var.ssh_key}" ]
+      ssh_keys = ["${var.ssh_key}"]
     }
   }
 }
@@ -450,6 +450,7 @@ resource "azurerm_subnet" "test" {
   virtual_network_name = "${azurerm_virtual_network.test.name}"
   address_prefix       = "10.0.2.0/24"
 }
+
 resource "azurerm_hdinsight_storm_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
@@ -521,6 +522,7 @@ resource "azurerm_subnet" "test" {
   virtual_network_name = "${azurerm_virtual_network.test.name}"
   address_prefix       = "10.0.2.0/24"
 }
+
 resource "azurerm_hdinsight_storm_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
diff --git a/azurerm/resource_arm_image_test.go b/azurerm/resource_arm_image_test.go
index 8967c5bd4361..ea67183ea2e6 100644
--- a/azurerm/resource_arm_image_test.go
+++ b/azurerm/resource_arm_image_test.go
@@ -665,7 +665,6 @@ func testAccAzureRMImage_standaloneImage_requiresImport(rInt int, userName strin
 	return fmt.Sprintf(`
 %s
 
-
 resource "azurerm_image" "import" {
   name                = "${azurerm_image.test.name}"
   location            = "${azurerm_image.test.location}"
diff --git a/azurerm/resource_arm_iot_dps_certificate_test.go b/azurerm/resource_arm_iot_dps_certificate_test.go
index 2d4405b82732..a4509fcf608d 100644
--- a/azurerm/resource_arm_iot_dps_certificate_test.go
+++ b/azurerm/resource_arm_iot_dps_certificate_test.go
@@ -175,20 +175,20 @@ resource "azurerm_iot_dps" "test" {
   name                = "acctestIoTDPS-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   location            = "${azurerm_resource_group.test.location}"
-	
+
   sku {
     name     = "S1"
     tier     = "Standard"
     capacity = "1"
-  }	
+  }
 }
 
 resource "azurerm_iot_dps_certificate" "test" {
-	name                = "acctestIoTDPSCertificate-%d"
-	resource_group_name = "${azurerm_resource_group.test.name}"
-	iot_dps_name        = "${azurerm_iot_dps.test.name}"
+  name                = "acctestIoTDPSCertificate-%d"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  iot_dps_name        = "${azurerm_iot_dps.test.name}"
 
-	certificate_content = "${filebase64("testdata/batch_certificate.cer")}"		
+  certificate_content = "${filebase64("testdata/batch_certificate.cer")}"
 }
 `, rInt, location, rInt, rInt)
 }
@@ -199,11 +199,11 @@ func testAccAzureRMIotDPSCertificate_requiresImport(rInt int, location string) s
 %s
 
 resource "azurerm_iot_dps_certificate" "test" {
-	name                = "${azurerm_iot_dps_certificate.test.name}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
-	iot_dps_name        = "${azurerm_iot_dps.test.name}"
+  name                = "${azurerm_iot_dps_certificate.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  iot_dps_name        = "${azurerm_iot_dps.test.name}"
 
-	certificate_content = "${filebase64("testdata/batch_certificate.cer")}"		
+  certificate_content = "${filebase64("testdata/batch_certificate.cer")}"
 }
 `, template)
 }
@@ -219,7 +219,7 @@ resource "azurerm_iot_dps" "test" {
   name                = "acctestIoTDPS-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   location            = "${azurerm_resource_group.test.location}"
-	
+
   sku {
     name     = "S1"
     tier     = "Standard"
@@ -232,11 +232,11 @@ resource "azurerm_iot_dps" "test" {
 }
 
 resource "azurerm_iot_dps_certificate" "test" {
-	name                = "acctestIoTDPSCertificate-%d"
-	resource_group_name = "${azurerm_resource_group.test.name}"
-	iot_dps_name        = "${azurerm_iot_dps.test.name}"
+  name                = "acctestIoTDPSCertificate-%d"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  iot_dps_name        = "${azurerm_iot_dps.test.name}"
 
-	certificate_content = "${filebase64("testdata/application_gateway_test.cer")}"		
+  certificate_content = "${filebase64("testdata/application_gateway_test.cer")}"
 }
 `, rInt, location, rInt, rInt)
 }
diff --git a/azurerm/resource_arm_iot_dps_test.go b/azurerm/resource_arm_iot_dps_test.go
index 0959e23fdc35..6315b89aee14 100644
--- a/azurerm/resource_arm_iot_dps_test.go
+++ b/azurerm/resource_arm_iot_dps_test.go
@@ -163,12 +163,12 @@ resource "azurerm_iot_dps" "test" {
   name                = "acctestIoTDPS-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   location            = "${azurerm_resource_group.test.location}"
-	
+
   sku {
     name     = "S1"
     tier     = "Standard"
     capacity = "1"
-  }	
+  }
 }
 `, rInt, location, rInt)
 }
@@ -182,7 +182,7 @@ resource "azurerm_iot_dps" "import" {
   name                = "${azurerm_iot_dps.test.name}"
   resource_group_name = "${azurerm_iot_dps.test.name}"
   location            = "${azurerm_iot_dps.test.location}"
-	
+
   sku {
     name     = "S1"
     tier     = "Standard"
@@ -203,7 +203,7 @@ resource "azurerm_iot_dps" "test" {
   name                = "acctestIoTDPS-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   location            = "${azurerm_resource_group.test.location}"
-	
+
   sku {
     name     = "S1"
     tier     = "Standard"
diff --git a/azurerm/resource_arm_iothub_test.go b/azurerm/resource_arm_iothub_test.go
index 1306c3920320..2a122d2da913 100644
--- a/azurerm/resource_arm_iothub_test.go
+++ b/azurerm/resource_arm_iothub_test.go
@@ -311,13 +311,13 @@ resource "azurerm_iothub" "test" {
     name     = "S1"
     tier     = "Standard"
     capacity = "1"
-	}
-	
-	ip_filter_rule {
-		name        = "test"
-		ip_mask     = "10.0.0.0/31"
-		action      = "Accept"
-	}
+  }
+
+  ip_filter_rule {
+    name    = "test"
+    ip_mask = "10.0.0.0/31"
+    action  = "Accept"
+  }
 
   tags = {
     purpose = "testing"
@@ -368,7 +368,7 @@ resource "azurerm_eventhub_authorization_rule" "test" {
   namespace_name      = "${azurerm_eventhub_namespace.test.name}"
   eventhub_name       = "${azurerm_eventhub.test.name}"
   name                = "acctest"
-  send                = true  
+  send                = true
 }
 
 resource "azurerm_iothub" "test" {
@@ -430,9 +430,9 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_iothub" "test" {
-  name                  = "acctestIoTHub-%d"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  location              = "${azurerm_resource_group.test.location}"
+  name                = "acctestIoTHub-%d"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  location            = "${azurerm_resource_group.test.location}"
 
   sku {
     name     = "S1"
@@ -446,7 +446,7 @@ resource "azurerm_iothub" "test" {
     enabled        = true
   }
 
-	tags = {
+  tags = {
     purpose = "testing"
   }
 }
diff --git a/azurerm/resource_arm_key_vault_access_policy_test.go b/azurerm/resource_arm_key_vault_access_policy_test.go
index 4e528584e554..8e1cfb5715cf 100644
--- a/azurerm/resource_arm_key_vault_access_policy_test.go
+++ b/azurerm/resource_arm_key_vault_access_policy_test.go
@@ -290,9 +290,9 @@ func testAccAzureRMKeyVaultAccessPolicy_requiresImport(rString string, location
 %s
 
 resource "azurerm_key_vault_access_policy" "import" {
-  key_vault_id  = "${azurerm_key_vault.test.id}"
-  tenant_id     = "${azurerm_key_vault_access_policy.test.tenant_id}"
-  object_id     = "${azurerm_key_vault_access_policy.test.object_id}"
+  key_vault_id = "${azurerm_key_vault.test.id}"
+  tenant_id    = "${azurerm_key_vault_access_policy.test.tenant_id}"
+  object_id    = "${azurerm_key_vault_access_policy.test.object_id}"
 
   key_permissions = [
     "get",
diff --git a/azurerm/resource_arm_key_vault_certificate_test.go b/azurerm/resource_arm_key_vault_certificate_test.go
index 7f77d6c3f09e..c61533ddebe8 100644
--- a/azurerm/resource_arm_key_vault_certificate_test.go
+++ b/azurerm/resource_arm_key_vault_certificate_test.go
@@ -394,7 +394,7 @@ resource "azurerm_key_vault" "test" {
 }
 
 resource "azurerm_key_vault_certificate" "test" {
-  name     = "acctestcert%s"
+  name         = "acctestcert%s"
   key_vault_id = "${azurerm_key_vault.test.id}"
 
   certificate {
@@ -572,8 +572,8 @@ resource "azurerm_key_vault" "test" {
 }
 
 resource "azurerm_key_vault_certificate" "test" {
-  name      = "acctestcert%s"
-  key_vault_id  = "${azurerm_key_vault.test.id}"
+  name         = "acctestcert%s"
+  key_vault_id = "${azurerm_key_vault.test.id}"
 
   certificate_policy {
     issuer_parameters {
@@ -656,7 +656,7 @@ resource "azurerm_key_vault" "test" {
     secret_permissions = [
       "set",
     ]
-    
+
     storage_permissions = [
       "set",
     ]
@@ -664,7 +664,7 @@ resource "azurerm_key_vault" "test" {
 }
 
 resource "azurerm_key_vault_certificate" "test" {
-  name     = "acctestcert%s"
+  name         = "acctestcert%s"
   key_vault_id = "${azurerm_key_vault.test.id}"
 
   certificate_policy {
@@ -759,7 +759,7 @@ resource "azurerm_key_vault" "test" {
 }
 
 resource "azurerm_key_vault_certificate" "test" {
-  name     = "acctestcert%s"
+  name         = "acctestcert%s"
   key_vault_id = "${azurerm_key_vault.test.id}"
 
   certificate_policy {
diff --git a/azurerm/resource_arm_key_vault_key_test.go b/azurerm/resource_arm_key_vault_key_test.go
index dc0d12237ad3..3f68491bbfb4 100644
--- a/azurerm/resource_arm_key_vault_key_test.go
+++ b/azurerm/resource_arm_key_vault_key_test.go
@@ -519,10 +519,10 @@ func testAccAzureRMKeyVaultKey_requiresImport(rString string, location string) s
 %s
 
 resource "azurerm_key_vault_key" "import" {
-  name      = "${azurerm_key_vault_key.test.name}"
-  key_vault_id  = "${azurerm_key_vault.test.id}"
-  key_type  = "EC"
-  key_size  = 2048
+  name         = "${azurerm_key_vault_key.test.name}"
+  key_vault_id = "${azurerm_key_vault.test.id}"
+  key_type     = "EC"
+  key_size     = 2048
 
   key_opts = [
     "sign",
@@ -575,10 +575,10 @@ resource "azurerm_key_vault" "test" {
 }
 
 resource "azurerm_key_vault_key" "test" {
-  name      = "key-%s"
-  key_vault_id  = "${azurerm_key_vault.test.id}"
-  key_type  = "RSA"
-  key_size  = 2048
+  name         = "key-%s"
+  key_vault_id = "${azurerm_key_vault.test.id}"
+  key_type     = "RSA"
+  key_size     = 2048
 
   key_opts = [
     "decrypt",
@@ -634,10 +634,10 @@ resource "azurerm_key_vault" "test" {
 }
 
 resource "azurerm_key_vault_key" "test" {
-  name      = "key-%s"
-  key_vault_id  = "${azurerm_key_vault.test.id}"
-  key_type  = "RSA-HSM"
-  key_size  = 2048
+  name         = "key-%s"
+  key_vault_id = "${azurerm_key_vault.test.id}"
+  key_type     = "RSA-HSM"
+  key_size     = 2048
 
   key_opts = [
     "decrypt",
@@ -693,10 +693,10 @@ resource "azurerm_key_vault" "test" {
 }
 
 resource "azurerm_key_vault_key" "test" {
-  name          = "key-%s"
-  key_vault_id  = "${azurerm_key_vault.test.id}"
-  key_type      = "RSA"
-  key_size      = 2048
+  name         = "key-%s"
+  key_vault_id = "${azurerm_key_vault.test.id}"
+  key_type     = "RSA"
+  key_size     = 2048
 
   key_opts = [
     "decrypt",
diff --git a/azurerm/resource_arm_key_vault_secret_test.go b/azurerm/resource_arm_key_vault_secret_test.go
index d9c388ed0426..52e86775168c 100644
--- a/azurerm/resource_arm_key_vault_secret_test.go
+++ b/azurerm/resource_arm_key_vault_secret_test.go
@@ -343,9 +343,9 @@ resource "azurerm_key_vault" "test" {
 }
 
 resource "azurerm_key_vault_secret" "test" {
-  name      = "secret-%s"
-  value     = "rick-and-morty"
-  key_vault_id  = "${azurerm_key_vault.test.id}"
+  name         = "secret-%s"
+  value        = "rick-and-morty"
+  key_vault_id = "${azurerm_key_vault.test.id}"
 }
 `, rString, location, rString, rString)
 }
@@ -403,9 +403,9 @@ func testAccAzureRMKeyVaultSecret_requiresImport(rString string, location string
 %s
 
 resource "azurerm_key_vault_secret" "import" {
-  name      = "${azurerm_key_vault_secret.test.name}"
-  value     = "${azurerm_key_vault_secret.test.value}"
-  key_vault_id  = "${azurerm_key_vault_secret.test.key_vault_id}"
+  name         = "${azurerm_key_vault_secret.test.name}"
+  value        = "${azurerm_key_vault_secret.test.value}"
+  key_vault_id = "${azurerm_key_vault_secret.test.key_vault_id}"
 }
 `, template)
 }
@@ -452,7 +452,7 @@ resource "azurerm_key_vault" "test" {
 resource "azurerm_key_vault_secret" "test" {
   name         = "secret-%s"
   value        = "<rick><morty /></rick>"
-  key_vault_id     = "${azurerm_key_vault.test.id}"
+  key_vault_id = "${azurerm_key_vault.test.id}"
   content_type = "application/xml"
 
   tags = {
diff --git a/azurerm/resource_arm_key_vault_test.go b/azurerm/resource_arm_key_vault_test.go
index 724f731863dc..f351563b8547 100644
--- a/azurerm/resource_arm_key_vault_test.go
+++ b/azurerm/resource_arm_key_vault_test.go
@@ -438,7 +438,6 @@ func testAccAzureRMKeyVault_requiresImport(rInt int, location string) string {
 	return fmt.Sprintf(`
 %s
 
-
 resource "azurerm_key_vault" "import" {
   name                = "${azurerm_key_vault.test.name}"
   location            = "${azurerm_key_vault.test.location}"
@@ -781,41 +780,43 @@ resource "azurerm_key_vault" "test" {
   sku {
     name = "premium"
   }
-%s
+
+  %s
 }
 
 %s
+
 `, rInt, location, rInt, accessPoliciesConfigs, storageAccountConfigs)
 }
 
 func testAccAzureRMKeyVault_generateStorageAccountConfigs(accountNum int, rs string) string {
 	return fmt.Sprintf(`
 resource "azurerm_storage_account" "testsa%d" {
-    name                      = "testsa%s%d"
-    resource_group_name       = "${azurerm_resource_group.test.name}"
-    location                  = "${azurerm_resource_group.test.location}"
-    account_tier              = "Standard"
-    account_replication_type  = "GRS"
-
-    identity {
-      type = "SystemAssigned"
-    }
-	
-    tags = {
-      environment = "testing"
-    }
+  name                     = "testsa%s%d"
+  resource_group_name      = "${azurerm_resource_group.test.name}"
+  location                 = "${azurerm_resource_group.test.location}"
+  account_tier             = "Standard"
+  account_replication_type = "GRS"
+
+  identity {
+    type = "SystemAssigned"
+  }
+
+  tags = {
+    environment = "testing"
+  }
 }
 `, accountNum, rs, accountNum)
 }
 
 func testAccAzureRMKeyVault_generateAccessPolicyConfigs(accountNum int) string {
 	return fmt.Sprintf(`
-  access_policy {
-    tenant_id          = "${data.azurerm_client_config.current.tenant_id}"
-    object_id          = "${azurerm_storage_account.testsa%d.identity.0.principal_id}"
-	
-    key_permissions    = ["get","create","delete","list","restore","recover","unwrapkey","wrapkey","purge","encrypt","decrypt","sign","verify"]
-    secret_permissions = ["get"]
-  }
+access_policy {
+  tenant_id = "${data.azurerm_client_config.current.tenant_id}"
+  object_id = "${azurerm_storage_account.testsa%d.identity.0.principal_id}"
+
+  key_permissions    = ["get", "create", "delete", "list", "restore", "recover", "unwrapkey", "wrapkey", "purge", "encrypt", "decrypt", "sign", "verify"]
+  secret_permissions = ["get"]
+}
 `, accountNum)
 }
diff --git a/azurerm/resource_arm_kubernetes_cluster_test.go b/azurerm/resource_arm_kubernetes_cluster_test.go
index 67fd26c6171d..9858ca7ed1fe 100644
--- a/azurerm/resource_arm_kubernetes_cluster_test.go
+++ b/azurerm/resource_arm_kubernetes_cluster_test.go
@@ -999,9 +999,10 @@ resource "azurerm_subnet" "test-aci" {
 
   delegation {
     name = "aciDelegation"
+
     service_delegation {
       name    = "Microsoft.ContainerInstance/containerGroups"
-      actions = [ "Microsoft.Network/virtualNetworks/subnets/action" ]
+      actions = ["Microsoft.Network/virtualNetworks/subnets/action"]
     }
   }
 }
@@ -1488,9 +1489,9 @@ resource "azurerm_kubernetes_cluster" "test" {
   }
 
   api_server_authorized_ip_ranges = [
-	"8.8.8.8/32",
-	"8.8.4.4/32",
-	"8.8.2.0/24",
+    "8.8.8.8/32",
+    "8.8.4.4/32",
+    "8.8.2.0/24",
   ]
 }
 `, rInt, location, rInt, rInt, clientId, clientSecret)
@@ -1549,7 +1550,6 @@ resource "azurerm_kubernetes_cluster" "test" {
     vm_size = "Standard_DS2_v2"
   }
 
-
   service_principal {
     client_id     = "%s"
     client_secret = "%s"
diff --git a/azurerm/resource_arm_loadbalancer_outbound_rule_test.go b/azurerm/resource_arm_loadbalancer_outbound_rule_test.go
index 336d02f73da8..271e0b5cd850 100644
--- a/azurerm/resource_arm_loadbalancer_outbound_rule_test.go
+++ b/azurerm/resource_arm_loadbalancer_outbound_rule_test.go
@@ -277,7 +277,6 @@ resource "azurerm_lb" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   sku                 = "Standard"
 
-
   frontend_ip_configuration {
     name                 = "one-%d"
     public_ip_address_id = "${azurerm_public_ip.test.id}"
@@ -291,12 +290,11 @@ resource "azurerm_lb_backend_address_pool" "test" {
 }
 
 resource "azurerm_lb_outbound_rule" "test" {
-  resource_group_name            = "${azurerm_resource_group.test.name}"
-  loadbalancer_id                = "${azurerm_lb.test.id}"
-  name                           = "%s"
-  backend_address_pool_id        = "${azurerm_lb_backend_address_pool.test.id}"
-  protocol                       = "All"
-
+  resource_group_name     = "${azurerm_resource_group.test.name}"
+  loadbalancer_id         = "${azurerm_lb.test.id}"
+  name                    = "%s"
+  backend_address_pool_id = "${azurerm_lb_backend_address_pool.test.id}"
+  protocol                = "All"
 
   frontend_ip_configuration {
     name = "one-%d"
@@ -311,11 +309,11 @@ func testAccAzureRMLoadBalancerOutboundRule_requiresImport(rInt int, name string
 %s
 
 resource "azurerm_lb_outbound_rule" "import" {
-  name                           = "${azurerm_lb_outbound_rule.test.name}"
-  resource_group_name            = "${azurerm_lb_outbound_rule.test.resource_group_name}"
-  loadbalancer_id                = "${azurerm_lb_outbound_rule.test.loadbalancer_id}"
-  backend_address_pool_id        = "${azurerm_lb_backend_address_pool.test.id}"
-  protocol                       = "All"
+  name                    = "${azurerm_lb_outbound_rule.test.name}"
+  resource_group_name     = "${azurerm_lb_outbound_rule.test.resource_group_name}"
+  loadbalancer_id         = "${azurerm_lb_outbound_rule.test.loadbalancer_id}"
+  backend_address_pool_id = "${azurerm_lb_backend_address_pool.test.id}"
+  protocol                = "All"
 
   frontend_ip_configuration {
     name = "${azurerm_lb_outbound_rule.test.frontend_ip_configuration.0.name}"
@@ -406,11 +404,11 @@ resource "azurerm_lb_backend_address_pool" "test" {
 }
 
 resource "azurerm_lb_outbound_rule" "test" {
-  resource_group_name            = "${azurerm_resource_group.test.name}"
-  loadbalancer_id                = "${azurerm_lb.test.id}"
-  name                           = "%s"
-  protocol                       = "Tcp"
-  backend_address_pool_id        = "${azurerm_lb_backend_address_pool.test.id}"
+  resource_group_name     = "${azurerm_resource_group.test.name}"
+  loadbalancer_id         = "${azurerm_lb.test.id}"
+  name                    = "%s"
+  protocol                = "Tcp"
+  backend_address_pool_id = "${azurerm_lb_backend_address_pool.test.id}"
 
   frontend_ip_configuration {
     name = "fe1-%d"
@@ -418,11 +416,11 @@ resource "azurerm_lb_outbound_rule" "test" {
 }
 
 resource "azurerm_lb_outbound_rule" "test2" {
-  resource_group_name            = "${azurerm_resource_group.test.name}"
-  loadbalancer_id                = "${azurerm_lb.test.id}"
-  name                           = "%s"
-  protocol                       = "Udp"
-  backend_address_pool_id        = "${azurerm_lb_backend_address_pool.test.id}"
+  resource_group_name     = "${azurerm_resource_group.test.name}"
+  loadbalancer_id         = "${azurerm_lb.test.id}"
+  name                    = "%s"
+  protocol                = "Udp"
+  backend_address_pool_id = "${azurerm_lb_backend_address_pool.test.id}"
 
   frontend_ip_configuration {
     name = "fe2-%d"
@@ -478,11 +476,11 @@ resource "azurerm_lb_backend_address_pool" "test" {
 }
 
 resource "azurerm_lb_outbound_rule" "test" {
-  resource_group_name            = "${azurerm_resource_group.test.name}"
-  loadbalancer_id                = "${azurerm_lb.test.id}"
-  name                           = "%s"
-  protocol                       = "All"
-  backend_address_pool_id        = "${azurerm_lb_backend_address_pool.test.id}"
+  resource_group_name     = "${azurerm_resource_group.test.name}"
+  loadbalancer_id         = "${azurerm_lb.test.id}"
+  name                    = "%s"
+  protocol                = "All"
+  backend_address_pool_id = "${azurerm_lb_backend_address_pool.test.id}"
 
   frontend_ip_configuration {
     name = "fe1-%d"
@@ -490,11 +488,11 @@ resource "azurerm_lb_outbound_rule" "test" {
 }
 
 resource "azurerm_lb_outbound_rule" "test2" {
-  resource_group_name            = "${azurerm_resource_group.test.name}"
-  loadbalancer_id                = "${azurerm_lb.test.id}"
-  name                           = "%s"
-  protocol                       = "All"
-  backend_address_pool_id        = "${azurerm_lb_backend_address_pool.test.id}"
+  resource_group_name     = "${azurerm_resource_group.test.name}"
+  loadbalancer_id         = "${azurerm_lb.test.id}"
+  name                    = "%s"
+  protocol                = "All"
+  backend_address_pool_id = "${azurerm_lb_backend_address_pool.test.id}"
 
   frontend_ip_configuration {
     name = "fe2-%d"
@@ -513,9 +511,8 @@ resource "azurerm_resource_group" "test" {
 resource "azurerm_public_ip_prefix" "test" {
   name                = "test-ip-%d"
   location            = "${azurerm_resource_group.test.location}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
-	prefix_length   = 31
-
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  prefix_length       = 31
 }
 
 resource "azurerm_lb" "test" {
@@ -524,9 +521,8 @@ resource "azurerm_lb" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   sku                 = "Standard"
 
-
   frontend_ip_configuration {
-    name                 = "one-%d"
+    name                = "one-%d"
     public_ip_prefix_id = "${azurerm_public_ip_prefix.test.id}"
   }
 }
@@ -538,12 +534,11 @@ resource "azurerm_lb_backend_address_pool" "test" {
 }
 
 resource "azurerm_lb_outbound_rule" "test" {
-  resource_group_name            = "${azurerm_resource_group.test.name}"
-  loadbalancer_id                = "${azurerm_lb.test.id}"
-  name                           = "%s"
-  backend_address_pool_id        = "${azurerm_lb_backend_address_pool.test.id}"
-  protocol                       = "All"
-
+  resource_group_name     = "${azurerm_resource_group.test.name}"
+  loadbalancer_id         = "${azurerm_lb.test.id}"
+  name                    = "%s"
+  backend_address_pool_id = "${azurerm_lb_backend_address_pool.test.id}"
+  protocol                = "All"
 
   frontend_ip_configuration {
     name = "one-%d"
diff --git a/azurerm/resource_arm_loadbalancer_rule_test.go b/azurerm/resource_arm_loadbalancer_rule_test.go
index 0933245b9df3..bddd10c6efe0 100644
--- a/azurerm/resource_arm_loadbalancer_rule_test.go
+++ b/azurerm/resource_arm_loadbalancer_rule_test.go
@@ -405,16 +405,15 @@ resource "azurerm_public_ip" "test" {
   name                = "test-ip-%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-	allocation_method   = "Static"
-	sku 								= "Standard"
-
+  allocation_method   = "Static"
+  sku                 = "Standard"
 }
 
 resource "azurerm_lb" "test" {
   name                = "arm-test-loadbalancer-%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-	sku 								= "Standard"
+  sku                 = "Standard"
 
   frontend_ip_configuration {
     name                 = "one-%d"
@@ -430,9 +429,8 @@ resource "azurerm_lb_rule" "test" {
   protocol                       = "Tcp"
   frontend_port                  = 3389
   backend_port                   = 3389
-	frontend_ip_configuration_name = "one-%d"
-	disable_outbound_snat          = true
-
+  frontend_ip_configuration_name = "one-%d"
+  disable_outbound_snat          = true
 }
 `, rInt, location, rInt, rInt, rInt, lbRuleName, rInt)
 }
@@ -583,7 +581,6 @@ resource "azurerm_lb_rule" "test2" {
   backend_port                   = 3390
   frontend_ip_configuration_name = "one-%d"
 }
-
 `, rInt, location, rInt, rInt, rInt, lbRuleName, rInt, lbRule2Name, rInt)
 }
 
@@ -633,6 +630,5 @@ resource "azurerm_lb_rule" "test2" {
   backend_port                   = 3391
   frontend_ip_configuration_name = "one-%d"
 }
-
 `, rInt, location, rInt, rInt, rInt, lbRuleName, rInt, lbRule2Name, rInt)
 }
diff --git a/azurerm/resource_arm_loadbalancer_test.go b/azurerm/resource_arm_loadbalancer_test.go
index 8ae12dc87dd4..cdf16c6ecd2d 100644
--- a/azurerm/resource_arm_loadbalancer_test.go
+++ b/azurerm/resource_arm_loadbalancer_test.go
@@ -412,7 +412,7 @@ resource "azurerm_lb" "test" {
   frontend_ip_configuration {
     name                 = "two-%d"
     public_ip_address_id = "${azurerm_public_ip.test1.id}"
-	}
+  }
 }
 `, rInt, location, rInt, rInt, rInt, rInt, rInt)
 }
@@ -462,17 +462,17 @@ resource "azurerm_public_ip_prefix" "test" {
   name                = "test-ip-prefix-%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  prefix_length   = 31
+  prefix_length       = 31
 }
 
 resource "azurerm_lb" "test" {
   name                = "acctest-loadbalancer-%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-	sku = "Standard"
+  sku                 = "Standard"
 
   frontend_ip_configuration {
-    name                 = "prefix-%d"
+    name                = "prefix-%d"
     public_ip_prefix_id = "${azurerm_public_ip_prefix.test.id}"
   }
 }
diff --git a/azurerm/resource_arm_log_analytics_workspace_test.go b/azurerm/resource_arm_log_analytics_workspace_test.go
index 45ceaa754f71..3fccf7f560b2 100644
--- a/azurerm/resource_arm_log_analytics_workspace_test.go
+++ b/azurerm/resource_arm_log_analytics_workspace_test.go
@@ -228,7 +228,7 @@ resource "azurerm_log_analytics_workspace" "test" {
   sku                 = "PerGB2018"
   retention_in_days   = 30
 
- tags = {
+  tags = {
     Environment = "Test"
   }
 }
diff --git a/azurerm/resource_arm_network_connection_monitor_test.go b/azurerm/resource_arm_network_connection_monitor_test.go
index 61fc8444dc1e..45ddebd46ad7 100644
--- a/azurerm/resource_arm_network_connection_monitor_test.go
+++ b/azurerm/resource_arm_network_connection_monitor_test.go
@@ -523,7 +523,7 @@ resource "azurerm_network_connection_monitor" "test" {
 
   destination {
     address = "terraform.io"
-    port = 80
+    port    = 80
   }
 
   depends_on = ["azurerm_virtual_machine_extension.src"]
@@ -662,9 +662,9 @@ resource "azurerm_network_connection_monitor" "test" {
   }
 
   destination {
-		address            = "terraform.io"
-		virtual_machine_id = "${azurerm_virtual_machine.src.id}"
-		port               = 80
+    address            = "terraform.io"
+    virtual_machine_id = "${azurerm_virtual_machine.src.id}"
+    port               = 80
   }
 
   depends_on = ["azurerm_virtual_machine_extension.src"]
@@ -689,7 +689,7 @@ resource "azurerm_network_connection_monitor" "import" {
 
   destination {
     address = "terraform.io"
-    port = 80
+    port    = 80
   }
 
   depends_on = ["azurerm_virtual_machine_extension.src"]
diff --git a/azurerm/resource_arm_network_interface_application_security_group_association_test.go b/azurerm/resource_arm_network_interface_application_security_group_association_test.go
index 545b492e365e..cdbb3d0b6e60 100644
--- a/azurerm/resource_arm_network_interface_application_security_group_association_test.go
+++ b/azurerm/resource_arm_network_interface_application_security_group_association_test.go
@@ -223,7 +223,7 @@ resource "azurerm_network_interface" "test" {
     name                           = "testconfiguration1"
     subnet_id                      = "${azurerm_subnet.test.id}"
     private_ip_address_allocation  = "Dynamic"
-    application_security_group_ids = [ "${azurerm_application_security_group.test.id}" ]
+    application_security_group_ids = ["${azurerm_application_security_group.test.id}"]
   }
 }
 
diff --git a/azurerm/resource_arm_policy_assignment_test.go b/azurerm/resource_arm_policy_assignment_test.go
index b5021640e599..6d84e8b00243 100644
--- a/azurerm/resource_arm_policy_assignment_test.go
+++ b/azurerm/resource_arm_policy_assignment_test.go
@@ -303,9 +303,11 @@ resource "azurerm_policy_assignment" "test" {
   name                 = "acctestpa-%d"
   scope                = "${azurerm_resource_group.test.id}"
   policy_definition_id = "${azurerm_policy_definition.test.id}"
+
   identity {
     type = "SystemAssigned"
   }
+
   location = "%s"
 }
 `, ri, ri, ri, location, ri, location)
diff --git a/azurerm/resource_arm_policy_set_definition_test.go b/azurerm/resource_arm_policy_set_definition_test.go
index c0f07ef79be3..70fce193474e 100644
--- a/azurerm/resource_arm_policy_set_definition_test.go
+++ b/azurerm/resource_arm_policy_set_definition_test.go
@@ -239,7 +239,7 @@ POLICY_DEFINITIONS
 func testAzureRMPolicySetDefinition_ManagementGroup(ri int) string {
 	return fmt.Sprintf(`
 resource "azurerm_management_group" "test" {
-	display_name = "acctestmg-%d"
+  display_name = "acctestmg-%d"
 }
 
 resource "azurerm_policy_set_definition" "test" {
diff --git a/azurerm/resource_arm_postgresql_configuration_test.go b/azurerm/resource_arm_postgresql_configuration_test.go
index babcef200e85..05cf6b907e60 100644
--- a/azurerm/resource_arm_postgresql_configuration_test.go
+++ b/azurerm/resource_arm_postgresql_configuration_test.go
@@ -237,7 +237,7 @@ resource "azurerm_postgresql_server" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
 
   sku {
-   name     = "GP_Gen5_2"
+    name     = "GP_Gen5_2"
     capacity = 2
     tier     = "GeneralPurpose"
     family   = "Gen5"
diff --git a/azurerm/resource_arm_redis_firewall_rule_test.go b/azurerm/resource_arm_redis_firewall_rule_test.go
index 10e6ef6610f1..2c25f97d3255 100644
--- a/azurerm/resource_arm_redis_firewall_rule_test.go
+++ b/azurerm/resource_arm_redis_firewall_rule_test.go
@@ -249,12 +249,12 @@ func testAccAzureRMRedisFirewallRule_multi(rInt int, location string) string {
 %s
 
 resource "azurerm_redis_firewall_rule" "double" {
-	name                = "fwruletwo%d"
-	redis_cache_name    = "${azurerm_redis_cache.test.name}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
-	start_ip            = "4.5.6.7"
-	end_ip              = "8.9.0.1"
-  }
+  name                = "fwruletwo%d"
+  redis_cache_name    = "${azurerm_redis_cache.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  start_ip            = "4.5.6.7"
+  end_ip              = "8.9.0.1"
+}
 `, testAccAzureRMRedisFirewallRule_basic(rInt, location), rInt)
 }
 
diff --git a/azurerm/resource_arm_scheduler_job_collection_test.go b/azurerm/resource_arm_scheduler_job_collection_test.go
index 34e95d3afea7..4ba4d55508b4 100644
--- a/azurerm/resource_arm_scheduler_job_collection_test.go
+++ b/azurerm/resource_arm_scheduler_job_collection_test.go
@@ -172,7 +172,8 @@ resource "azurerm_scheduler_job_collection" "import" {
   location            = "${azurerm_scheduler_job_collection.test.location}"
   resource_group_name = "${azurerm_scheduler_job_collection.test.resource_group_name}"
   sku                 = "${azurerm_scheduler_job_collection.test.sku}"
-  %s
+
+    %s
 }
 `, testAccAzureRMSchedulerJobCollection_basic(rInt, location, additional), additional)
 }
diff --git a/azurerm/resource_arm_service_fabric_cluster_test.go b/azurerm/resource_arm_service_fabric_cluster_test.go
index 1a91609e9910..6343f35ba6e8 100644
--- a/azurerm/resource_arm_service_fabric_cluster_test.go
+++ b/azurerm/resource_arm_service_fabric_cluster_test.go
@@ -1592,6 +1592,7 @@ resource "azurerm_resource_group" "test" {
   name     = "acctestRG-%d"
   location = "%s"
 }
+
 resource "azurerm_service_fabric_cluster" "test" {
   name                = "acctest-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
@@ -1600,20 +1601,25 @@ resource "azurerm_service_fabric_cluster" "test" {
   upgrade_mode        = "Automatic"
   vm_image            = "Windows"
   management_endpoint = "http://example:80"
+
   node_type {
-    name                 = "first"
+    name = "first"
+
     placement_properties = {
       "HasSSD" = "true"
     }
+
     capacities = {
       "ClientConnections" = "20000"
-      "MemoryGB" = "8"
+      "MemoryGB"          = "8"
     }
+
     instance_count       = 3
     is_primary           = true
     client_endpoint_port = 2020
     http_endpoint_port   = 80
   }
+
   tags = {
     Hello = "World"
   }
diff --git a/azurerm/resource_arm_storage_account_test.go b/azurerm/resource_arm_storage_account_test.go
index 77e59baf8283..3b943c8a9948 100644
--- a/azurerm/resource_arm_storage_account_test.go
+++ b/azurerm/resource_arm_storage_account_test.go
@@ -906,11 +906,11 @@ resource "azurerm_storage_account" "testsa" {
   name                = "unlikely23exst2acct%s"
   resource_group_name = "${azurerm_resource_group.testrg.name}"
 
-  location                  = "${azurerm_resource_group.testrg.location}"
-  account_kind				= "StorageV2"
-  account_tier              = "Standard"
-  account_replication_type  = "LRS"
-  is_hns_enabled 			= true
+  location                 = "${azurerm_resource_group.testrg.location}"
+  account_kind             = "StorageV2"
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+  is_hns_enabled           = true
 }
 `, rInt, location, rString)
 }
@@ -926,11 +926,11 @@ resource "azurerm_storage_account" "testsa" {
   name                = "unlikely23exst2acct%s"
   resource_group_name = "${azurerm_resource_group.testrg.name}"
 
-  location                  = "${azurerm_resource_group.testrg.location}"
-  account_kind				= "StorageV2"
-  account_tier              = "Standard"
-  account_replication_type  = "LRS"
-  is_hns_enabled            = false
+  location                 = "${azurerm_resource_group.testrg.location}"
+  account_kind             = "StorageV2"
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+  is_hns_enabled           = false
 }
 `, rInt, location, rString)
 }
@@ -1148,9 +1148,9 @@ resource "azurerm_storage_account" "testsa" {
   account_replication_type = "LRS"
 
   network_rules {
-    default_action         = "Deny"
-    ip_rules               = ["127.0.0.1", "127.0.0.2"]
-    bypass                 = ["Logging", "Metrics"]
+    default_action = "Deny"
+    ip_rules       = ["127.0.0.1", "127.0.0.2"]
+    bypass         = ["Logging", "Metrics"]
   }
 
   tags = {
diff --git a/azurerm/resource_arm_storage_blob_test.go b/azurerm/resource_arm_storage_blob_test.go
index cf2746c3c239..02204485914e 100644
--- a/azurerm/resource_arm_storage_blob_test.go
+++ b/azurerm/resource_arm_storage_blob_test.go
@@ -494,9 +494,9 @@ resource "azurerm_storage_blob" "test" {
 
   type = "page"
   size = 5120
-  
+
   metadata = {
-    test = "value1"
+    test  = "value1"
     test2 = "value2"
   }
 }
diff --git a/azurerm/resource_arm_stream_analytics_function_javascript_udf_test.go b/azurerm/resource_arm_stream_analytics_function_javascript_udf_test.go
index dd44d507cc77..9f5d94025409 100644
--- a/azurerm/resource_arm_stream_analytics_function_javascript_udf_test.go
+++ b/azurerm/resource_arm_stream_analytics_function_javascript_udf_test.go
@@ -161,6 +161,7 @@ resource "azurerm_stream_analytics_function_javascript_udf" "test" {
   name                      = "acctestinput-%d"
   stream_analytics_job_name = "${azurerm_stream_analytics_job.test.name}"
   resource_group_name       = "${azurerm_stream_analytics_job.test.resource_group_name}"
+
   script = <<SCRIPT
 function getRandomNumber(in) {
   return in;
@@ -203,6 +204,7 @@ resource "azurerm_stream_analytics_function_javascript_udf" "test" {
   name                      = "acctestinput-%d"
   stream_analytics_job_name = "${azurerm_stream_analytics_job.test.name}"
   resource_group_name       = "${azurerm_stream_analytics_job.test.resource_group_name}"
+
   script = <<SCRIPT
 function getRandomNumber(first, second) {
   return first * second;
diff --git a/azurerm/resource_arm_stream_analytics_job_test.go b/azurerm/resource_arm_stream_analytics_job_test.go
index 81825e9117ca..dcf012fb351e 100644
--- a/azurerm/resource_arm_stream_analytics_job_test.go
+++ b/azurerm/resource_arm_stream_analytics_job_test.go
@@ -164,8 +164,8 @@ resource "azurerm_stream_analytics_job" "test" {
   events_out_of_order_max_delay_in_seconds = 50
   events_out_of_order_policy               = "Adjust"
   output_error_policy                      = "Drop"
-	streaming_units                          = 3
-		
+  streaming_units                          = 3
+
   tags = {
     environment = "Test"
   }
diff --git a/azurerm/resource_arm_stream_analytics_output_eventhub_test.go b/azurerm/resource_arm_stream_analytics_output_eventhub_test.go
index 091125a2ed86..316f90c41db0 100644
--- a/azurerm/resource_arm_stream_analytics_output_eventhub_test.go
+++ b/azurerm/resource_arm_stream_analytics_output_eventhub_test.go
@@ -257,13 +257,13 @@ func testAccAzureRMStreamAnalyticsOutputEventHub_avro(rInt int, location string)
 %s
 
 resource "azurerm_stream_analytics_output_eventhub" "test" {
-  name                         = "acctestinput-%d"
-  stream_analytics_job_name    = "${azurerm_stream_analytics_job.test.name}"
-  resource_group_name          = "${azurerm_stream_analytics_job.test.resource_group_name}"
-  eventhub_name                = "${azurerm_eventhub.test.name}"
-  servicebus_namespace         = "${azurerm_eventhub_namespace.test.name}"
-  shared_access_policy_key     = "${azurerm_eventhub_namespace.test.default_primary_key}"
-  shared_access_policy_name    = "RootManageSharedAccessKey"
+  name                      = "acctestinput-%d"
+  stream_analytics_job_name = "${azurerm_stream_analytics_job.test.name}"
+  resource_group_name       = "${azurerm_stream_analytics_job.test.resource_group_name}"
+  eventhub_name             = "${azurerm_eventhub.test.name}"
+  servicebus_namespace      = "${azurerm_eventhub_namespace.test.name}"
+  shared_access_policy_key  = "${azurerm_eventhub_namespace.test.default_primary_key}"
+  shared_access_policy_name = "RootManageSharedAccessKey"
 
   serialization {
     type = "Avro"
@@ -278,13 +278,13 @@ func testAccAzureRMStreamAnalyticsOutputEventHub_csv(rInt int, location string)
 %s
 
 resource "azurerm_stream_analytics_output_eventhub" "test" {
-  name                         = "acctestinput-%d"
-  stream_analytics_job_name    = "${azurerm_stream_analytics_job.test.name}"
-  resource_group_name          = "${azurerm_stream_analytics_job.test.resource_group_name}"
-  eventhub_name                = "${azurerm_eventhub.test.name}"
-  servicebus_namespace         = "${azurerm_eventhub_namespace.test.name}"
-  shared_access_policy_key     = "${azurerm_eventhub_namespace.test.default_primary_key}"
-  shared_access_policy_name    = "RootManageSharedAccessKey"
+  name                      = "acctestinput-%d"
+  stream_analytics_job_name = "${azurerm_stream_analytics_job.test.name}"
+  resource_group_name       = "${azurerm_stream_analytics_job.test.resource_group_name}"
+  eventhub_name             = "${azurerm_eventhub.test.name}"
+  servicebus_namespace      = "${azurerm_eventhub_namespace.test.name}"
+  shared_access_policy_key  = "${azurerm_eventhub_namespace.test.default_primary_key}"
+  shared_access_policy_name = "RootManageSharedAccessKey"
 
   serialization {
     type            = "Csv"
diff --git a/azurerm/resource_arm_stream_analytics_output_mssql_test.go b/azurerm/resource_arm_stream_analytics_output_mssql_test.go
index 611bf803a0e5..76cc4ffbb33b 100644
--- a/azurerm/resource_arm_stream_analytics_output_mssql_test.go
+++ b/azurerm/resource_arm_stream_analytics_output_mssql_test.go
@@ -170,12 +170,11 @@ resource "azurerm_stream_analytics_output_mssql" "test" {
   stream_analytics_job_name = "${azurerm_stream_analytics_job.test.name}"
   resource_group_name       = "${azurerm_stream_analytics_job.test.resource_group_name}"
 
-  server 						= "${azurerm_sql_server.test.fully_qualified_domain_name}"
-  user 							= "${azurerm_sql_server.test.administrator_login}"
-  password 					= "${azurerm_sql_server.test.administrator_login_password}"
-  database 					= "${azurerm_sql_database.test.name}"
-  table			 				= "AccTestTable"
-
+  server   = "${azurerm_sql_server.test.fully_qualified_domain_name}"
+  user     = "${azurerm_sql_server.test.administrator_login}"
+  password = "${azurerm_sql_server.test.administrator_login_password}"
+  database = "${azurerm_sql_database.test.name}"
+  table    = "AccTestTable"
 }
 `, template, rInt)
 }
@@ -190,11 +189,11 @@ resource "azurerm_stream_analytics_output_mssql" "test" {
   stream_analytics_job_name = "${azurerm_stream_analytics_job.test.name}"
   resource_group_name       = "${azurerm_stream_analytics_job.test.resource_group_name}"
 
-  server 						= "${azurerm_sql_server.test.fully_qualified_domain_name}"
-  user 							= "${azurerm_sql_server.test.administrator_login}"
-  password 					= "${azurerm_sql_server.test.administrator_login_password}"
-  database 					= "${azurerm_sql_database.test.name}"
-  table			 				= "AccTestTable"
+  server   = "${azurerm_sql_server.test.fully_qualified_domain_name}"
+  user     = "${azurerm_sql_server.test.administrator_login}"
+  password = "${azurerm_sql_server.test.administrator_login_password}"
+  database = "${azurerm_sql_database.test.name}"
+  table    = "AccTestTable"
 }
 `, template, rInt)
 }
@@ -209,19 +208,17 @@ resource "azurerm_stream_analytics_output_mssql" "import" {
   stream_analytics_job_name = "${azurerm_stream_analytics_output_mssql.test.stream_analytics_job_name}"
   resource_group_name       = "${azurerm_stream_analytics_output_mssql.test.resource_group_name}"
 
-  server 										= "${azurerm_sql_server.test.fully_qualified_domain_name}"
-  user 											= "${azurerm_sql_server.test.administrator_login}"
-  password 									= "${azurerm_sql_server.test.administrator_login_password}"
-  database 									= "${azurerm_sql_database.test.name}"
-  table			 								= "AccTestTable"
-
+  server   = "${azurerm_sql_server.test.fully_qualified_domain_name}"
+  user     = "${azurerm_sql_server.test.administrator_login}"
+  password = "${azurerm_sql_server.test.administrator_login_password}"
+  database = "${azurerm_sql_database.test.name}"
+  table    = "AccTestTable"
 }
 `, template)
 }
 
 func testAccAzureRMStreamAnalyticsOutputSql_template(rInt int, rString string, location string) string {
 	return fmt.Sprintf(`
-
 resource "azurerm_resource_group" "test" {
   name     = "acctestRG-%d"
   location = "%s"
@@ -237,16 +234,16 @@ resource "azurerm_sql_server" "test" {
 }
 
 resource "azurerm_sql_database" "test" {
-	name                             = "acctestdb"
-	resource_group_name              = "${azurerm_resource_group.test.name}"
-	location                         = "${azurerm_resource_group.test.location}"
-	server_name                      = "${azurerm_sql_server.test.name}"
-	requested_service_objective_name = "S0"
-	collation                        = "SQL_LATIN1_GENERAL_CP1_CI_AS"
-	max_size_bytes                   = "268435456000"
-	create_mode                      = "Default"
+  name                             = "acctestdb"
+  resource_group_name              = "${azurerm_resource_group.test.name}"
+  location                         = "${azurerm_resource_group.test.location}"
+  server_name                      = "${azurerm_sql_server.test.name}"
+  requested_service_objective_name = "S0"
+  collation                        = "SQL_LATIN1_GENERAL_CP1_CI_AS"
+  max_size_bytes                   = "268435456000"
+  create_mode                      = "Default"
 }
-  
+
 resource "azurerm_stream_analytics_job" "test" {
   name                                     = "acctestjob-%s"
   resource_group_name                      = "${azurerm_resource_group.test.name}"
diff --git a/azurerm/resource_arm_stream_analytics_stream_input_blob_test.go b/azurerm/resource_arm_stream_analytics_stream_input_blob_test.go
index 0ce7a9b5340d..938c7aa5d2be 100644
--- a/azurerm/resource_arm_stream_analytics_stream_input_blob_test.go
+++ b/azurerm/resource_arm_stream_analytics_stream_input_blob_test.go
@@ -226,15 +226,15 @@ func testAccAzureRMStreamAnalyticsStreamInputBlob_avro(rInt int, rString string,
 %s
 
 resource "azurerm_stream_analytics_stream_input_blob" "test" {
-  name                         = "acctestinput-%d"
-  stream_analytics_job_name    = "${azurerm_stream_analytics_job.test.name}"
-  resource_group_name          = "${azurerm_stream_analytics_job.test.resource_group_name}"
-  storage_account_name         = "${azurerm_storage_account.test.name}"
-  storage_account_key          = "${azurerm_storage_account.test.primary_access_key}"
-  storage_container_name       = "${azurerm_storage_container.test.name}"
-  path_pattern                 = "some-random-pattern"
-  date_format                  = "yyyy/MM/dd"
-  time_format                  = "HH"
+  name                      = "acctestinput-%d"
+  stream_analytics_job_name = "${azurerm_stream_analytics_job.test.name}"
+  resource_group_name       = "${azurerm_stream_analytics_job.test.resource_group_name}"
+  storage_account_name      = "${azurerm_storage_account.test.name}"
+  storage_account_key       = "${azurerm_storage_account.test.primary_access_key}"
+  storage_container_name    = "${azurerm_storage_container.test.name}"
+  path_pattern              = "some-random-pattern"
+  date_format               = "yyyy/MM/dd"
+  time_format               = "HH"
 
   serialization {
     type = "Avro"
@@ -249,15 +249,15 @@ func testAccAzureRMStreamAnalyticsStreamInputBlob_csv(rInt int, rString string,
 %s
 
 resource "azurerm_stream_analytics_stream_input_blob" "test" {
-  name                         = "acctestinput-%d"
-  stream_analytics_job_name    = "${azurerm_stream_analytics_job.test.name}"
-  resource_group_name          = "${azurerm_stream_analytics_job.test.resource_group_name}"
-  storage_account_name         = "${azurerm_storage_account.test.name}"
-  storage_account_key          = "${azurerm_storage_account.test.primary_access_key}"
-  storage_container_name       = "${azurerm_storage_container.test.name}"
-  path_pattern                 = "some-random-pattern"
-  date_format                  = "yyyy/MM/dd"
-  time_format                  = "HH"
+  name                      = "acctestinput-%d"
+  stream_analytics_job_name = "${azurerm_stream_analytics_job.test.name}"
+  resource_group_name       = "${azurerm_stream_analytics_job.test.resource_group_name}"
+  storage_account_name      = "${azurerm_storage_account.test.name}"
+  storage_account_key       = "${azurerm_storage_account.test.primary_access_key}"
+  storage_container_name    = "${azurerm_storage_container.test.name}"
+  path_pattern              = "some-random-pattern"
+  date_format               = "yyyy/MM/dd"
+  time_format               = "HH"
 
   serialization {
     type            = "Csv"
@@ -274,15 +274,15 @@ func testAccAzureRMStreamAnalyticsStreamInputBlob_json(rInt int, rString string,
 %s
 
 resource "azurerm_stream_analytics_stream_input_blob" "test" {
-  name                         = "acctestinput-%d"
-  stream_analytics_job_name    = "${azurerm_stream_analytics_job.test.name}"
-  resource_group_name          = "${azurerm_stream_analytics_job.test.resource_group_name}"
-  storage_account_name         = "${azurerm_storage_account.test.name}"
-  storage_account_key          = "${azurerm_storage_account.test.primary_access_key}"
-  storage_container_name       = "${azurerm_storage_container.test.name}"
-  path_pattern                 = "some-random-pattern"
-  date_format                  = "yyyy/MM/dd"
-  time_format                  = "HH"
+  name                      = "acctestinput-%d"
+  stream_analytics_job_name = "${azurerm_stream_analytics_job.test.name}"
+  resource_group_name       = "${azurerm_stream_analytics_job.test.resource_group_name}"
+  storage_account_name      = "${azurerm_storage_account.test.name}"
+  storage_account_key       = "${azurerm_storage_account.test.primary_access_key}"
+  storage_container_name    = "${azurerm_storage_container.test.name}"
+  path_pattern              = "some-random-pattern"
+  date_format               = "yyyy/MM/dd"
+  time_format               = "HH"
 
   serialization {
     type     = "Json"
@@ -313,15 +313,15 @@ resource "azurerm_storage_container" "updated" {
 }
 
 resource "azurerm_stream_analytics_stream_input_blob" "test" {
-  name                         = "acctestinput-%d"
-  stream_analytics_job_name    = "${azurerm_stream_analytics_job.test.name}"
-  resource_group_name          = "${azurerm_stream_analytics_job.test.resource_group_name}"
-  storage_account_name         = "${azurerm_storage_account.updated.name}"
-  storage_account_key          = "${azurerm_storage_account.updated.primary_access_key}"
-  storage_container_name       = "${azurerm_storage_container.updated.name}"
-  path_pattern                 = "some-other-pattern"
-  date_format                  = "yyyy-MM-dd"
-  time_format                  = "HH"
+  name                      = "acctestinput-%d"
+  stream_analytics_job_name = "${azurerm_stream_analytics_job.test.name}"
+  resource_group_name       = "${azurerm_stream_analytics_job.test.resource_group_name}"
+  storage_account_name      = "${azurerm_storage_account.updated.name}"
+  storage_account_key       = "${azurerm_storage_account.updated.primary_access_key}"
+  storage_container_name    = "${azurerm_storage_container.updated.name}"
+  path_pattern              = "some-other-pattern"
+  date_format               = "yyyy-MM-dd"
+  time_format               = "HH"
 
   serialization {
     type = "Avro"
diff --git a/azurerm/resource_arm_subnet_test.go b/azurerm/resource_arm_subnet_test.go
index ef4b9feea013..1682e5f16ccb 100644
--- a/azurerm/resource_arm_subnet_test.go
+++ b/azurerm/resource_arm_subnet_test.go
@@ -498,12 +498,14 @@ resource "azurerm_subnet" "test" {
   resource_group_name  = "${azurerm_resource_group.test.name}"
   virtual_network_name = "${azurerm_virtual_network.test.name}"
   address_prefix       = "10.0.2.0/24"
+
   delegation {
-     name = "acctestdelegation"
-     service_delegation {
-       name    = "Microsoft.ContainerInstance/containerGroups"
-       actions = ["Microsoft.Network/virtualNetworks/subnets/action"]
-     }
+    name = "acctestdelegation"
+
+    service_delegation {
+      name    = "Microsoft.ContainerInstance/containerGroups"
+      actions = ["Microsoft.Network/virtualNetworks/subnets/action"]
+    }
   }
 }
 `, rInt, location, rInt, rInt)
diff --git a/azurerm/resource_arm_virtual_machine_extension_test.go b/azurerm/resource_arm_virtual_machine_extension_test.go
index fc49a51f31c7..22d02ba46058 100644
--- a/azurerm/resource_arm_virtual_machine_extension_test.go
+++ b/azurerm/resource_arm_virtual_machine_extension_test.go
@@ -285,7 +285,6 @@ func testAccAzureRMVirtualMachineExtension_requiresImport(rInt int, location str
 	return fmt.Sprintf(`
 %s
 
-
 resource "azurerm_virtual_machine_extension" "import" {
   name                 = "${azurerm_virtual_machine_extension.test.name}"
   resource_group_name  = "${azurerm_virtual_machine_extension.test.resource_group_name}"
diff --git a/azurerm/resource_arm_virtual_machine_unmanaged_disks_test.go b/azurerm/resource_arm_virtual_machine_unmanaged_disks_test.go
index 202d2eb81f86..6e7eb685f484 100644
--- a/azurerm/resource_arm_virtual_machine_unmanaged_disks_test.go
+++ b/azurerm/resource_arm_virtual_machine_unmanaged_disks_test.go
@@ -1980,12 +1980,12 @@ resource "azurerm_network_interface" "test" {
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
 
-     ip_configuration {
-     	name = "testconfiguration1"
-     	subnet_id = "${azurerm_subnet.test.id}"
-     	private_ip_address_allocation = "Dynamic"
-     }
- }
+  ip_configuration {
+    name                          = "testconfiguration1"
+    subnet_id                     = "${azurerm_subnet.test.id}"
+    private_ip_address_allocation = "Dynamic"
+  }
+}
 
 resource "azurerm_storage_account" "test" {
   name                     = "accsa%d"
@@ -2074,12 +2074,12 @@ resource "azurerm_network_interface" "test" {
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
 
-     ip_configuration {
-     	name = "testconfiguration1"
-     	subnet_id = "${azurerm_subnet.test.id}"
-     	private_ip_address_allocation = "Dynamic"
-     }
- }
+  ip_configuration {
+    name                          = "testconfiguration1"
+    subnet_id                     = "${azurerm_subnet.test.id}"
+    private_ip_address_allocation = "Dynamic"
+  }
+}
 
 resource "azurerm_storage_account" "test" {
   name                     = "accsa%d"
diff --git a/website/docs/auth/managed_service_identity.html.markdown b/website/docs/auth/managed_service_identity.html.markdown
index 76b824d9615f..52b37d3d5626 100644
--- a/website/docs/auth/managed_service_identity.html.markdown
+++ b/website/docs/auth/managed_service_identity.html.markdown
@@ -98,7 +98,7 @@ provider "azurerm" {
 
   use_msi = true
 
-  ...
+  #...
 }
 ```
 
@@ -111,10 +111,10 @@ provider "azurerm" {
 
   backend "azurerm" {
     storage_account_name = "abcd1234"
-    container_name = "tfstate"
-    key = "prod.terraform.tfstate"
-    subscription_id = "00000000-0000-0000-0000-000000000000"
-    tenant_id = "00000000-0000-0000-0000-000000000000"
+    container_name       = "tfstate"
+    key                  = "prod.terraform.tfstate"
+    subscription_id      = "00000000-0000-0000-0000-000000000000"
+    tenant_id            = "00000000-0000-0000-0000-000000000000"
   }
 }
 ```
@@ -132,4 +132,4 @@ Developers who are using a custom MSI endpoint can specify the endpoint in one o
 
 You don't normally need to set the endpoint, because Terraform and the Azure Provider will automatically locate the appropriate endpoint.
 
--->
\ No newline at end of file
+-->
diff --git a/website/docs/d/api_management_group.html.markdown b/website/docs/d/api_management_group.html.markdown
index 5ca86744e677..da3c915eea54 100644
--- a/website/docs/d/api_management_group.html.markdown
+++ b/website/docs/d/api_management_group.html.markdown
@@ -42,4 +42,4 @@ output "group_type" {
 
 * `external_id` - The identifier of the external Group.
 
-* `type` - The type of this API Management Group, such as `custom` or `external`.
\ No newline at end of file
+* `type` - The type of this API Management Group, such as `custom` or `external`.
diff --git a/website/docs/d/api_management_user.html.markdown b/website/docs/d/api_management_user.html.markdown
index 2cc134a96f86..5f4f689be320 100644
--- a/website/docs/d/api_management_user.html.markdown
+++ b/website/docs/d/api_management_user.html.markdown
@@ -44,4 +44,4 @@ output "notes" {
 
 * `note` - Any notes about this User.
 
-* `state` - The current state of this User, for example `active`, `blocked` or `pending`.
\ No newline at end of file
+* `state` - The current state of this User, for example `active`, `blocked` or `pending`.
diff --git a/website/docs/d/batch_account.html.markdown b/website/docs/d/batch_account.html.markdown
index 917037879ab4..b5da67c8a2bb 100644
--- a/website/docs/d/batch_account.html.markdown
+++ b/website/docs/d/batch_account.html.markdown
@@ -52,4 +52,4 @@ The following attributes are exported:
 
 * `tags` - A map of tags assigned to the Batch account.
 
-~> **NOTE:** Primary and secondary access keys are only available when `pool_allocation_mode` is set to `BatchService`. See [documentation](https://docs.microsoft.com/en-us/azure/batch/batch-api-basics) for more information.
\ No newline at end of file
+~> **NOTE:** Primary and secondary access keys are only available when `pool_allocation_mode` is set to `BatchService`. See [documentation](https://docs.microsoft.com/en-us/azure/batch/batch-api-basics) for more information.
diff --git a/website/docs/d/batch_certificate.html.markdown b/website/docs/d/batch_certificate.html.markdown
index ec8164689360..b45017b65e30 100644
--- a/website/docs/d/batch_certificate.html.markdown
+++ b/website/docs/d/batch_certificate.html.markdown
@@ -14,7 +14,6 @@ Use this data source to access information about an existing certificate in a Ba
 ## Example Usage
 
 ```hcl
-
 data "azurerm_batch_certificate" "example" {
   name                = "SHA1-42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
   account_name        = "examplebatchaccount"
@@ -46,4 +45,4 @@ The following attributes are exported:
 
 * `thumbprint` - The thumbprint of the certificate.
 
-* `thumbprint_algorithm` - The algorithm of the certificate thumbprint.
\ No newline at end of file
+* `thumbprint_algorithm` - The algorithm of the certificate thumbprint.
diff --git a/website/docs/d/express_route_circuit.html.markdown b/website/docs/d/express_route_circuit.html.markdown
index bdaa225666e2..add01b0c6f4d 100644
--- a/website/docs/d/express_route_circuit.html.markdown
+++ b/website/docs/d/express_route_circuit.html.markdown
@@ -14,12 +14,12 @@ Use this data source to access information about an existing ExpressRoute circui
 
 ```hcl
 data "azurerm_express_route_circuit" test {
-    resource_group_name = "${azurerm_resource_group.test.name}"
-    name                = "${azurerm_express_route_circuit.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  name                = "${azurerm_express_route_circuit.test.name}"
 }
 
 output "express_route_circuit_id" {
-    value = "${data.azurerm_express_route_circuit.test.id}"
+  value = "${data.azurerm_express_route_circuit.test.id}"
 }
 
 output "service_key" {
@@ -70,4 +70,4 @@ output "service_key" {
 `sku` supports the following:
 
 * `tier` - The service tier. Possible values are `Standard` or `Premium`.
-* `family` - The billing mode for bandwidth. Possible values are `MeteredData` or `UnlimitedData`.
\ No newline at end of file
+* `family` - The billing mode for bandwidth. Possible values are `MeteredData` or `UnlimitedData`.
diff --git a/website/docs/d/firewall.html.markdown b/website/docs/d/firewall.html.markdown
index 177921a512e7..960cbaca3af8 100644
--- a/website/docs/d/firewall.html.markdown
+++ b/website/docs/d/firewall.html.markdown
@@ -46,4 +46,4 @@ A `ip_configuration` block exports the following:
 
 * `private_ip_address` - The private IP address of the Azure Firewall.
 
-* `public_ip_address_id`- The Resource ID of the public IP address of the Azure Firewall.
\ No newline at end of file
+* `public_ip_address_id`- The Resource ID of the public IP address of the Azure Firewall.
diff --git a/website/docs/d/hdinsight_cluster.html.markdown b/website/docs/d/hdinsight_cluster.html.markdown
index 21f4655be2d8..50a1c6a87376 100644
--- a/website/docs/d/hdinsight_cluster.html.markdown
+++ b/website/docs/d/hdinsight_cluster.html.markdown
@@ -60,4 +60,4 @@ A `gateway` block exports the following:
 
 * `username` - The username used for the Ambari Portal.
 
-* `password` - The password used for the Ambari Portal.
\ No newline at end of file
+* `password` - The password used for the Ambari Portal.
diff --git a/website/docs/d/key_vault_secret.html.markdown b/website/docs/d/key_vault_secret.html.markdown
index dc5188aed22b..d02955d183f5 100644
--- a/website/docs/d/key_vault_secret.html.markdown
+++ b/website/docs/d/key_vault_secret.html.markdown
@@ -18,7 +18,7 @@ Use this data source to access information about an existing Key Vault Secret.
 
 ```hcl
 data "azurerm_key_vault_secret" "test" {
-  name      = "secret-sauce"
+  name         = "secret-sauce"
   key_vault_id = "${data.azurerm_key_vault.existing.id}"
 }
 
diff --git a/website/docs/d/redis_cache.html.markdown b/website/docs/d/redis_cache.html.markdown
index cb801d7c6840..cb24053a1a94 100644
--- a/website/docs/d/redis_cache.html.markdown
+++ b/website/docs/d/redis_cache.html.markdown
@@ -25,7 +25,6 @@ output "primary_access_key" {
 output "hostname" {
   value = "${data.azurerm_redis_cache.example.hostname}"
 }
-
 ```
 
 ## Argument Reference
diff --git a/website/docs/d/role_definition.markdown b/website/docs/d/role_definition.markdown
index e81f1aeff167..235dde67de56 100644
--- a/website/docs/d/role_definition.markdown
+++ b/website/docs/d/role_definition.markdown
@@ -25,7 +25,7 @@ resource "azurerm_role_definition" "custom" {
 
 data "azurerm_role_definition" "custom" {
   role_definition_id = "${azurerm_role_definition.custom.role_definition_id}"
-  scope              = "${data.azurerm_subscription.primary.id}" # /subscriptions/00000000-0000-0000-0000-000000000000
+  scope              = "${data.azurerm_subscription.primary.id}"              # /subscriptions/00000000-0000-0000-0000-000000000000
 }
 
 data "azurerm_role_definition" "custom-byname" {
@@ -40,6 +40,7 @@ data "azurerm_builtin_role_definition" "builtin" {
 output "custom_role_definition_id" {
   value = "${data.azurerm_role_definition.custom.id}"
 }
+
 output "contributor_role_definition_id" {
   value = "${data.azurerm_role_definition.builtin.id}"
 }
diff --git a/website/docs/d/sql_server.html.markdown b/website/docs/d/sql_server.html.markdown
index 00f6297ca410..a3bfffc0f469 100644
--- a/website/docs/d/sql_server.html.markdown
+++ b/website/docs/d/sql_server.html.markdown
@@ -39,4 +39,4 @@ output "sql_server_id" {
 
 * `administrator_login` - The administrator username of the SQL Server.
 
-* `tags` - A mapping of tags assigned to the resource.
\ No newline at end of file
+* `tags` - A mapping of tags assigned to the resource.
diff --git a/website/docs/d/user_assigned_identity.html.markdown b/website/docs/d/user_assigned_identity.html.markdown
index ddd6da471315..a5bdca7428e5 100644
--- a/website/docs/d/user_assigned_identity.html.markdown
+++ b/website/docs/d/user_assigned_identity.html.markdown
@@ -1,44 +1,44 @@
----
-layout: "azurerm"
-page_title: "Azure Resource Manager: azure_user_assigned_identity"
-sidebar_current: "docs-azurerm-datasource-user-assigned-identity"
-description: |-
-  Gets information about an existing User Assigned Identity.
-
----
-
-# Data Source: azurerm_user_assigned_identity
-
-Use this data source to access information about an existing User Assigned Identity.
-
-## Example Usage (reference an existing)
-
-```hcl
-data "azurerm_user_assigned_identity" "example" {
-  name                = "name_of_user_assigned_identity"
-  resource_group_name = "name_of_resource_group"
-}
-
-output "uai_client_id" {
-  value = "${data.azurerm_user_assigned_identity.example.client_id}"
-}
-
-output "uai_principal_id" {
-  value = "${data.azurerm_user_assigned_identity.example.principal_id}"
-}
-```
-
-## Argument Reference
-
-* `name` - (Required)  The name of the User Assigned Identity.
-* `resource_group_name` - (Required) The name of the Resource Group in which the User Assigned Identity exists.
-
-## Attributes Reference
-
-The following attributes are exported:
-
-* `id` - The Resource ID of the User Assigned Identity.
-* `location` - The Azure location where the User Assigned Identity exists.
-* `principal_id` - The Service Principal ID of the User Assigned Identity.
-* `client_id` - The Client ID of the User Assigned Identity.
-* `tags` - A mapping of tags assigned to the User Assigned Identity.
\ No newline at end of file
+---
+layout: "azurerm"
+page_title: "Azure Resource Manager: azure_user_assigned_identity"
+sidebar_current: "docs-azurerm-datasource-user-assigned-identity"
+description: |-
+  Gets information about an existing User Assigned Identity.
+
+---
+
+# Data Source: azurerm_user_assigned_identity
+
+Use this data source to access information about an existing User Assigned Identity.
+
+## Example Usage (reference an existing)
+
+```hcl
+data "azurerm_user_assigned_identity" "example" {
+  name                = "name_of_user_assigned_identity"
+  resource_group_name = "name_of_resource_group"
+}
+
+output "uai_client_id" {
+  value = "${data.azurerm_user_assigned_identity.example.client_id}"
+}
+
+output "uai_principal_id" {
+  value = "${data.azurerm_user_assigned_identity.example.principal_id}"
+}
+```
+
+## Argument Reference
+
+* `name` - (Required)  The name of the User Assigned Identity.
+* `resource_group_name` - (Required) The name of the Resource Group in which the User Assigned Identity exists.
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `id` - The Resource ID of the User Assigned Identity.
+* `location` - The Azure location where the User Assigned Identity exists.
+* `principal_id` - The Service Principal ID of the User Assigned Identity.
+* `client_id` - The Client ID of the User Assigned Identity.
+* `tags` - A mapping of tags assigned to the User Assigned Identity.
diff --git a/website/docs/d/virtual_network_gateway_connection.html.markdown b/website/docs/d/virtual_network_gateway_connection.html.markdown
index 3e05d23f0d45..117dd41fef9c 100644
--- a/website/docs/d/virtual_network_gateway_connection.html.markdown
+++ b/website/docs/d/virtual_network_gateway_connection.html.markdown
@@ -1,103 +1,103 @@
----
-layout: "azurerm"
-page_title: "Azure Resource Manager: azurerm_virtual_network_gateway_connection"
-sidebar_current: "docs-azurerm-datasource-virtual-network-gateway-connection"
-description: |-
-  Gets information about an existing Virtual Network Gateway Connection.
----
-
-# Data Source: azurerm_virtual_network_gateway_connection
-
-Use this data source to access information about an existing Virtual Network Gateway Connection.
-
-## Example Usage
-
-```hcl
-data "azurerm_virtual_network_gateway_connection" "test" {
-  name                = "production"
-  resource_group_name = "networking"
-}
-
-output "virtual_network_gateway_connection_id" {
-  value = "${data.azurerm_virtual_network_gateway_connection.test.id}"
-}
-```
-
-## Argument Reference
-
-* `name` - (Required) Specifies the name of the Virtual Network Gateway Connection.
-* `resource_group_name` - (Required) Specifies the name of the resource group the Virtual Network Gateway Connection is located in.
-
-## Attributes Reference
-
-* `id` - The ID of the Virtual Network Gateway Connection.
-
-* `location` - The location/region where the connection is
-    located.
-
-* `type` - The type of connection. Valid options are `IPsec`
-    (Site-to-Site), `ExpressRoute` (ExpressRoute), and `Vnet2Vnet` (VNet-to-VNet).
-
-* `virtual_network_gateway_id` - The ID of the Virtual Network Gateway
-    in which the connection is created. 
-
-* `authorization_key` - The authorization key associated with the
-    Express Route Circuit. This field is present only if the type is an
-    ExpressRoute connection.
-
-* `express_route_circuit_id` - The ID of the Express Route Circuit
-    (i.e. when `type` is `ExpressRoute`).
-
-* `peer_virtual_network_gateway_id` - The ID of the peer virtual
-    network gateway when a VNet-to-VNet connection (i.e. when `type`
-    is `Vnet2Vnet`). 
-
-* `local_network_gateway_id` - The ID of the local network gateway
-    when a Site-to-Site connection (i.e. when `type` is `IPsec`).
-
-* `routing_weight` - The routing weight.
-
-* `shared_key` - The shared IPSec key. 
-
-* `enable_bgp` - If `true`, BGP (Border Gateway Protocol) is enabled
-    for this connection. 
-
-* `express_route_gateway_bypass` - If `true`, data packets will bypass ExpressRoute Gateway for data forwarding. This is only valid for ExpressRoute connections.
-
-* `use_policy_based_traffic_selectors` - If `true`, policy-based traffic
-    selectors are enabled for this connection. Enabling policy-based traffic
-    selectors requires an `ipsec_policy` block. 
-
-* `ipsec_policy` (Optional) A `ipsec_policy` block which is documented below.
-    Only a single policy can be defined for a connection. For details on
-    custom policies refer to [the relevant section in the Azure documentation](https://docs.microsoft.com/en-us/azure/vpn-gateway/vpn-gateway-ipsecikepolicy-rm-powershell).
-
-* `tags` - (Optional) A mapping of tags to assign to the resource.
-
-The `ipsec_policy` block supports:
-
-* `dh_group` - The DH group used in IKE phase 1 for initial SA. Valid
-    options are `DHGroup1`, `DHGroup14`, `DHGroup2`, `DHGroup2048`, `DHGroup24`,
-    `ECP256`, `ECP384`, or `None`.
-
-* `ike_encryption` - The IKE encryption algorithm. Valid
-    options are `AES128`, `AES192`, `AES256`, `DES`, or `DES3`.
-
-* `ike_integrity` - The IKE integrity algorithm. Valid
-    options are `MD5`, `SHA1`, `SHA256`, or `SHA384`.
-
-* `ipsec_encryption` - The IPSec encryption algorithm. Valid
-    options are `AES128`, `AES192`, `AES256`, `DES`, `DES3`, `GCMAES128`, `GCMAES192`, `GCMAES256`, or `None`.
-
-* `ipsec_integrity` - The IPSec integrity algorithm. Valid
-    options are `GCMAES128`, `GCMAES192`, `GCMAES256`, `MD5`, `SHA1`, or `SHA256`.
-
-* `pfs_group` - The DH group used in IKE phase 2 for new child SA.
-    Valid options are `ECP256`, `ECP384`, `PFS1`, `PFS2`, `PFS2048`, `PFS24`,
-    or `None`.
-
-* `sa_datasize` - The IPSec SA payload size in KB. Must be at least
-    `1024` KB. 
-
-* `sa_lifetime` - The IPSec SA lifetime in seconds. Must be at least
-    `300` seconds.
\ No newline at end of file
+---
+layout: "azurerm"
+page_title: "Azure Resource Manager: azurerm_virtual_network_gateway_connection"
+sidebar_current: "docs-azurerm-datasource-virtual-network-gateway-connection"
+description: |-
+  Gets information about an existing Virtual Network Gateway Connection.
+---
+
+# Data Source: azurerm_virtual_network_gateway_connection
+
+Use this data source to access information about an existing Virtual Network Gateway Connection.
+
+## Example Usage
+
+```hcl
+data "azurerm_virtual_network_gateway_connection" "test" {
+  name                = "production"
+  resource_group_name = "networking"
+}
+
+output "virtual_network_gateway_connection_id" {
+  value = "${data.azurerm_virtual_network_gateway_connection.test.id}"
+}
+```
+
+## Argument Reference
+
+* `name` - (Required) Specifies the name of the Virtual Network Gateway Connection.
+* `resource_group_name` - (Required) Specifies the name of the resource group the Virtual Network Gateway Connection is located in.
+
+## Attributes Reference
+
+* `id` - The ID of the Virtual Network Gateway Connection.
+
+* `location` - The location/region where the connection is
+    located.
+
+* `type` - The type of connection. Valid options are `IPsec`
+    (Site-to-Site), `ExpressRoute` (ExpressRoute), and `Vnet2Vnet` (VNet-to-VNet).
+
+* `virtual_network_gateway_id` - The ID of the Virtual Network Gateway
+    in which the connection is created. 
+
+* `authorization_key` - The authorization key associated with the
+    Express Route Circuit. This field is present only if the type is an
+    ExpressRoute connection.
+
+* `express_route_circuit_id` - The ID of the Express Route Circuit
+    (i.e. when `type` is `ExpressRoute`).
+
+* `peer_virtual_network_gateway_id` - The ID of the peer virtual
+    network gateway when a VNet-to-VNet connection (i.e. when `type`
+    is `Vnet2Vnet`). 
+
+* `local_network_gateway_id` - The ID of the local network gateway
+    when a Site-to-Site connection (i.e. when `type` is `IPsec`).
+
+* `routing_weight` - The routing weight.
+
+* `shared_key` - The shared IPSec key. 
+
+* `enable_bgp` - If `true`, BGP (Border Gateway Protocol) is enabled
+    for this connection. 
+
+* `express_route_gateway_bypass` - If `true`, data packets will bypass ExpressRoute Gateway for data forwarding. This is only valid for ExpressRoute connections.
+
+* `use_policy_based_traffic_selectors` - If `true`, policy-based traffic
+    selectors are enabled for this connection. Enabling policy-based traffic
+    selectors requires an `ipsec_policy` block. 
+
+* `ipsec_policy` (Optional) A `ipsec_policy` block which is documented below.
+    Only a single policy can be defined for a connection. For details on
+    custom policies refer to [the relevant section in the Azure documentation](https://docs.microsoft.com/en-us/azure/vpn-gateway/vpn-gateway-ipsecikepolicy-rm-powershell).
+
+* `tags` - (Optional) A mapping of tags to assign to the resource.
+
+The `ipsec_policy` block supports:
+
+* `dh_group` - The DH group used in IKE phase 1 for initial SA. Valid
+    options are `DHGroup1`, `DHGroup14`, `DHGroup2`, `DHGroup2048`, `DHGroup24`,
+    `ECP256`, `ECP384`, or `None`.
+
+* `ike_encryption` - The IKE encryption algorithm. Valid
+    options are `AES128`, `AES192`, `AES256`, `DES`, or `DES3`.
+
+* `ike_integrity` - The IKE integrity algorithm. Valid
+    options are `MD5`, `SHA1`, `SHA256`, or `SHA384`.
+
+* `ipsec_encryption` - The IPSec encryption algorithm. Valid
+    options are `AES128`, `AES192`, `AES256`, `DES`, `DES3`, `GCMAES128`, `GCMAES192`, `GCMAES256`, or `None`.
+
+* `ipsec_integrity` - The IPSec integrity algorithm. Valid
+    options are `GCMAES128`, `GCMAES192`, `GCMAES256`, `MD5`, `SHA1`, or `SHA256`.
+
+* `pfs_group` - The DH group used in IKE phase 2 for new child SA.
+    Valid options are `ECP256`, `ECP384`, `PFS1`, `PFS2`, `PFS2048`, `PFS24`,
+    or `None`.
+
+* `sa_datasize` - The IPSec SA payload size in KB. Must be at least
+    `1024` KB. 
+
+* `sa_lifetime` - The IPSec SA lifetime in seconds. Must be at least
+    `300` seconds.
diff --git a/website/docs/r/api_management_api_operation_policy.html.markdown b/website/docs/r/api_management_api_operation_policy.html.markdown
index 98b0f7a8ac72..4f4b3bb6fb58 100644
--- a/website/docs/r/api_management_api_operation_policy.html.markdown
+++ b/website/docs/r/api_management_api_operation_policy.html.markdown
@@ -15,15 +15,16 @@ Manages an API Management API Operation Policy
 
 ```hcl
 resource "azurerm_api_management_api_operation" "example" {
-  ...
+  #...
 }
 
 resource "azurerm_api_management_api_operation_policy" "example" {
-  api_name              = "${azurerm_api_management_api_operation.example.api_name}"
-  api_management_name   = "${azurerm_api_management_api_operation.example.api_management_name}"
-  resource_group_name   = "${azurerm_api_management_api_operation.example.resource_group_name}"
-  operation_id          = "${azurerm_api_management_api_operation.example.operation_id}"
-  xml_content           = <<XML
+  api_name            = "${azurerm_api_management_api_operation.example.api_name}"
+  api_management_name = "${azurerm_api_management_api_operation.example.api_management_name}"
+  resource_group_name = "${azurerm_api_management_api_operation.example.resource_group_name}"
+  operation_id        = "${azurerm_api_management_api_operation.example.operation_id}"
+
+  xml_content = <<XML
 <policies>
   <inbound>
     <find-and-replace from="xyz" to="abc" />
diff --git a/website/docs/r/api_management_api_policy.html.markdown b/website/docs/r/api_management_api_policy.html.markdown
index 8d3788ba056b..86771c701359 100644
--- a/website/docs/r/api_management_api_policy.html.markdown
+++ b/website/docs/r/api_management_api_policy.html.markdown
@@ -21,10 +21,11 @@ data "azurerm_api_management_api" "example" {
 }
 
 resource "azurerm_api_management_api_policy" "example" {
-  api_name              = "${data.azurerm_api_management_api.example.name}"
-  api_management_name   = "${data.azurerm_api_management_api.example.api_management_name}"
-  resource_group_name   = "${data.azurerm_api_management_api.example.resource_group_name}"
-  xml_content           = <<XML
+  api_name            = "${data.azurerm_api_management_api.example.name}"
+  api_management_name = "${data.azurerm_api_management_api.example.api_management_name}"
+  resource_group_name = "${data.azurerm_api_management_api.example.resource_group_name}"
+
+  xml_content = <<XML
 <policies>
   <inbound>
     <find-and-replace from="xyz" to="abc" />
diff --git a/website/docs/r/api_management_api_schema.html.markdown b/website/docs/r/api_management_api_schema.html.markdown
index 487730228330..a9fabcee63e0 100644
--- a/website/docs/r/api_management_api_schema.html.markdown
+++ b/website/docs/r/api_management_api_schema.html.markdown
@@ -28,7 +28,6 @@ resource "azurerm_api_management_api_schema" "example" {
   content_type        = "application/vnd.ms-azure-apim.xsd+xml"
   value               = "${file("api_management_api_schema.xml")}"
 }
-
 ```
 
 ## Argument Reference
diff --git a/website/docs/r/api_management_authorization_server.html.markdown b/website/docs/r/api_management_authorization_server.html.markdown
index 1feafdd5d863..8321d61a8562 100644
--- a/website/docs/r/api_management_authorization_server.html.markdown
+++ b/website/docs/r/api_management_authorization_server.html.markdown
@@ -29,8 +29,9 @@ resource "azurerm_api_management_authorization_server" "example" {
   authorization_endpoint       = "https://example.mydomain.com/client/authorize"
   client_id                    = "42424242-4242-4242-4242-424242424242"
   client_registration_endpoint = "https://example.mydomain.com/client/register"
+
   grant_types = [
-     "authorizationCode",
+    "authorizationCode",
   ]
 }
 ```
diff --git a/website/docs/r/api_management_product_api.html.markdown b/website/docs/r/api_management_product_api.html.markdown
index 6960745796b1..598b1703b8e6 100644
--- a/website/docs/r/api_management_product_api.html.markdown
+++ b/website/docs/r/api_management_product_api.html.markdown
@@ -18,13 +18,13 @@ data "azurerm_api_management" "example" {
   resource_group_name = "example-resources"
 }
 
-
 data "azurerm_api_management_api" "example" {
   name                = "search-api"
   api_management_name = "${data.azurerm_api_management.example.name}"
   resource_group_name = "${data.azurerm_api_management.example.resource_group_name}"
   revision            = "2"
 }
+
 data "azurerm_api_management_product" "test" {
   product_id          = "my-product"
   api_management_name = "${data.azurerm_api_management.example.name}"
diff --git a/website/docs/r/api_management_product_policy.html.markdown b/website/docs/r/api_management_product_policy.html.markdown
index cca8d42900fd..3777ad771163 100644
--- a/website/docs/r/api_management_product_policy.html.markdown
+++ b/website/docs/r/api_management_product_policy.html.markdown
@@ -21,9 +21,10 @@ data "azurerm_api_management_product" "example" {
 }
 
 resource "azurerm_api_management_product_policy" "example" {
-  product_id            = "${data.azurerm_api_management_product.example.product_id}"
-  api_management_name   = "${data.azurerm_api_management_product.example.api_management_name}"
-  resource_group_name   = "${data.azurerm_api_management_product.example.resource_group_name}"
+  product_id          = "${data.azurerm_api_management_product.example.product_id}"
+  api_management_name = "${data.azurerm_api_management_product.example.api_management_name}"
+  resource_group_name = "${data.azurerm_api_management_product.example.resource_group_name}"
+
   xml_content = <<XML
 <policies>
   <inbound>
diff --git a/website/docs/r/api_management_user.html.markdown b/website/docs/r/api_management_user.html.markdown
index 09c5a638e499..94d9663386bc 100644
--- a/website/docs/r/api_management_user.html.markdown
+++ b/website/docs/r/api_management_user.html.markdown
@@ -32,13 +32,13 @@ resource "azurerm_api_management" "test" {
 }
 
 resource "azurerm_api_management_user" "test" {
-  user_id               = "5931a75ae4bbd512288c680b"
-  api_management_name   = "${azurerm_api_management.test.name}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  first_name            = "Example"
-  last_name             = "User"
-  email                 = "tom+tfdev@hashicorp.com"
-  state                 = "active"
+  user_id             = "5931a75ae4bbd512288c680b"
+  api_management_name = "${azurerm_api_management.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  first_name          = "Example"
+  last_name           = "User"
+  email               = "tom+tfdev@hashicorp.com"
+  state               = "active"
 }
 ```
 
diff --git a/website/docs/r/application_gateway.html.markdown b/website/docs/r/application_gateway.html.markdown
index 6e666776bd02..dea5786e8fdd 100644
--- a/website/docs/r/application_gateway.html.markdown
+++ b/website/docs/r/application_gateway.html.markdown
@@ -90,7 +90,7 @@ resource "azurerm_application_gateway" "network" {
   backend_http_settings {
     name                  = "${local.http_setting_name}"
     cookie_based_affinity = "Disabled"
-    path         = "/path1/"
+    path                  = "/path1/"
     port                  = 80
     protocol              = "Http"
     request_timeout       = 1
@@ -104,11 +104,11 @@ resource "azurerm_application_gateway" "network" {
   }
 
   request_routing_rule {
-    name                        = "${local.request_routing_rule_name}"
-    rule_type                   = "Basic"
-    http_listener_name          = "${local.listener_name}"
-    backend_address_pool_name   = "${local.backend_address_pool_name}"
-    backend_http_settings_name  = "${local.http_setting_name}"
+    name                       = "${local.request_routing_rule_name}"
+    rule_type                  = "Basic"
+    http_listener_name         = "${local.listener_name}"
+    backend_address_pool_name  = "${local.backend_address_pool_name}"
+    backend_http_settings_name = "${local.http_setting_name}"
   }
 }
 ```
diff --git a/website/docs/r/batch_account.html.markdown b/website/docs/r/batch_account.html.markdown
index 62222dd3dc4e..668ea24551e7 100644
--- a/website/docs/r/batch_account.html.markdown
+++ b/website/docs/r/batch_account.html.markdown
@@ -70,4 +70,4 @@ The following attributes are exported:
 
 * `account_endpoint` - The account endpoint used to interact with the Batch service.
 
-~> **NOTE:** Primary and secondary access keys are only available when `pool_allocation_mode` is set to `BatchService`. See [documentation](https://docs.microsoft.com/en-us/azure/batch/batch-api-basics) for more information.
\ No newline at end of file
+~> **NOTE:** Primary and secondary access keys are only available when `pool_allocation_mode` is set to `BatchService`. See [documentation](https://docs.microsoft.com/en-us/azure/batch/batch-api-basics) for more information.
diff --git a/website/docs/r/batch_pool.html.markdown b/website/docs/r/batch_pool.html.markdown
index 5c2ccc095be5..801aea3a3b05 100644
--- a/website/docs/r/batch_pool.html.markdown
+++ b/website/docs/r/batch_pool.html.markdown
@@ -58,7 +58,8 @@ resource "azurerm_batch_pool" "test" {
 
   auto_scale {
     evaluation_interval = "PT15M"
-    formula             = <<EOF
+
+    formula = <<EOF
       startingNumberOfVMs = 1;
       maxNumberofVMs = 25;
       pendingTaskSamplePercent = $PendingTasks.GetSamplePercent(180 * TimeInterval_Second);
@@ -96,8 +97,8 @@ EOF
   }
 
   certificate {
-    id             = "${azurerm_batch_certificate.testcer.id}"
-    visibility = [ "StartTask" ]
+    id         = "${azurerm_batch_certificate.testcer.id}"
+    visibility = ["StartTask"]
   }
 }
 ```
diff --git a/website/docs/r/cosmosdb_mongo_collection.html.markdown b/website/docs/r/cosmosdb_mongo_collection.html.markdown
index 822152d3326a..3d18edf7377d 100644
--- a/website/docs/r/cosmosdb_mongo_collection.html.markdown
+++ b/website/docs/r/cosmosdb_mongo_collection.html.markdown
@@ -23,27 +23,26 @@ resource "azurerm_cosmosdb_mongo_database" "example" {
   resource_group_name = "${data.azurerm_cosmosdb_account.example.resource_group_name}"
   account_name        = "${data.azurerm_cosmosdb_account.example.name}"
 }
+
 resource "azurerm_cosmosdb_mongo_collection" "example" {
   name                = "tfex-cosmos-mongo-db"
   resource_group_name = "${data.azurerm_cosmosdb_account.example.resource_group_name}"
   account_name        = "${data.azurerm_cosmosdb_account.example.name}"
   database_name       = "${data.azurerm_cosmosdb_account.example.name}"
-  
-  default_ttl_seconds = "777"   
+
+  default_ttl_seconds = "777"
   shard_key           = "uniqueKey"
-  
+
   indexes {
     key    = "aKey"
     unique = false
   }
-  
+
   indexes {
     key    = "uniqueKey"
     unique = true
   }
 }
-
-
 ```
 
 ## Argument Reference
diff --git a/website/docs/r/cosmosdb_sql_database.html.markdown b/website/docs/r/cosmosdb_sql_database.html.markdown
index d2f7980e5c59..e71bdbd91aa0 100644
--- a/website/docs/r/cosmosdb_sql_database.html.markdown
+++ b/website/docs/r/cosmosdb_sql_database.html.markdown
@@ -48,4 +48,4 @@ Cosmos SQL Database can be imported using the `resource id`, e.g.
 
 ```shell
 terraform import azurerm_cosmosdb_sql_database.db1 /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.DocumentDB/databaseAccounts/account1/apis/sql/databases/db1
-```
\ No newline at end of file
+```
diff --git a/website/docs/r/data_factory_linked_service_data_lake_storage_gen2.html.markdown b/website/docs/r/data_factory_linked_service_data_lake_storage_gen2.html.markdown
index e705a20168ab..21ab21a5472d 100644
--- a/website/docs/r/data_factory_linked_service_data_lake_storage_gen2.html.markdown
+++ b/website/docs/r/data_factory_linked_service_data_lake_storage_gen2.html.markdown
@@ -28,11 +28,10 @@ resource "azurerm_data_factory" "example" {
 
 data "azurerm_client_config" "current" {}
 
-
 resource "azurerm_data_factory_linked_service_data_lake_storage_gen2" "example" {
-  name                 = "example"
-  resource_group_name  = "${azurerm_resource_group.test.name}"
-  data_factory_name    = "${azurerm_data_factory.test.name}"
+  name                  = "example"
+  resource_group_name   = "${azurerm_resource_group.test.name}"
+  data_factory_name     = "${azurerm_data_factory.test.name}"
   service_principal_id  = "${data.azurerm_client_config.current.client_id}"
   service_principal_key = "exampleKey"
   tenant                = "11111111-1111-1111-1111-111111111111"
diff --git a/website/docs/r/data_factory_linked_service_postgresql.html.markdown b/website/docs/r/data_factory_linked_service_postgresql.html.markdown
index e9e71e5784cc..24696556cae2 100644
--- a/website/docs/r/data_factory_linked_service_postgresql.html.markdown
+++ b/website/docs/r/data_factory_linked_service_postgresql.html.markdown
@@ -30,7 +30,7 @@ resource "azurerm_data_factory_linked_service_postgresql" "example" {
   name                = "example"
   resource_group_name = "${azurerm_resource_group.test.name}"
   data_factory_name   = "${azurerm_data_factory.test.name}"
-  connection_string   ="Host=example;Port=5432;Database=example;UID=example;EncryptionMethod=0;Password=example"
+  connection_string   = "Host=example;Port=5432;Database=example;UID=example;EncryptionMethod=0;Password=example"
 }
 ```
 
diff --git a/website/docs/r/ddos_protection_plan.html.markdown b/website/docs/r/ddos_protection_plan.html.markdown
index 6aa65f18edf3..f0db90c712b9 100644
--- a/website/docs/r/ddos_protection_plan.html.markdown
+++ b/website/docs/r/ddos_protection_plan.html.markdown
@@ -56,4 +56,4 @@ Azure DDoS Protection Plan can be imported using the `resource id`, e.g.
 
 ```shell
 terraform import azurerm_ddos_protection_plan.test /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Network/ddosProtectionPlans/testddospplan
-```
\ No newline at end of file
+```
diff --git a/website/docs/r/eventgrid_event_subscription.html.markdown b/website/docs/r/eventgrid_event_subscription.html.markdown
index 34817f49c769..5b657810ff43 100644
--- a/website/docs/r/eventgrid_event_subscription.html.markdown
+++ b/website/docs/r/eventgrid_event_subscription.html.markdown
@@ -20,29 +20,30 @@ resource "azurerm_resource_group" "default" {
 }
 
 resource "azurerm_storage_account" "default" {
-	name                     = "defaultStorageAccount"
-	resource_group_name      = "${azurerm_resource_group.default.name}"
-	location                 = "${azurerm_resource_group.default.location}"
-	account_tier             = "Standard"
-	account_replication_type = "LRS"
-  
-	tags = {
-	  environment = "staging"
-	}
-  }
-  
-  resource "azurerm_storage_queue" "default" {
-	name                 = "defaultStorageQueue"
-	resource_group_name  = "${azurerm_resource_group.default.name}"
-	storage_account_name = "${azurerm_storage_account.default.name}"
+  name                     = "defaultStorageAccount"
+  resource_group_name      = "${azurerm_resource_group.default.name}"
+  location                 = "${azurerm_resource_group.default.location}"
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+
+  tags = {
+    environment = "staging"
   }
+}
+
+resource "azurerm_storage_queue" "default" {
+  name                 = "defaultStorageQueue"
+  resource_group_name  = "${azurerm_resource_group.default.name}"
+  storage_account_name = "${azurerm_storage_account.default.name}"
+}
 
 resource "azurerm_eventgrid_event_subscription" "default" {
   name  = "defaultEventSubscription"
   scope = "${azurerm_resource_group.default.id}"
+
   storage_queue_endpoint {
-	  storage_account_id = "${azurerm_storage_account.default.id}"
-	  queue_name         = "${azurerm_storage_queue.default.name}"
+    storage_account_id = "${azurerm_storage_account.default.id}"
+    queue_name         = "${azurerm_storage_queue.default.name}"
   }
 }
 ```
diff --git a/website/docs/r/firewall_application_rule_collection.html.markdown b/website/docs/r/firewall_application_rule_collection.html.markdown
index d92970a7e094..c7be55eb1175 100644
--- a/website/docs/r/firewall_application_rule_collection.html.markdown
+++ b/website/docs/r/firewall_application_rule_collection.html.markdown
@@ -47,9 +47,9 @@ resource "azurerm_firewall" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
 
   ip_configuration {
-    name                          = "configuration"
-    subnet_id                     = "${azurerm_subnet.test.id}"
-    public_ip_address_id          = "${azurerm_public_ip.test.id}"
+    name                 = "configuration"
+    subnet_id            = "${azurerm_subnet.test.id}"
+    public_ip_address_id = "${azurerm_public_ip.test.id}"
   }
 }
 
@@ -72,8 +72,8 @@ resource "azurerm_firewall_application_rule_collection" "test" {
     ]
 
     protocol {
-        port = "443"
-        type = "Https"
+      port = "443"
+      type = "Https"
     }
   }
 }
diff --git a/website/docs/r/firewall_nat_rule_collection.html.markdown b/website/docs/r/firewall_nat_rule_collection.html.markdown
index d4bd6542ec4b..3f14ec28fc31 100644
--- a/website/docs/r/firewall_nat_rule_collection.html.markdown
+++ b/website/docs/r/firewall_nat_rule_collection.html.markdown
@@ -34,11 +34,11 @@ resource "azurerm_subnet" "test" {
 }
 
 resource "azurerm_public_ip" "test" {
-  name                         = "testpip"
-  location                     = "${azurerm_resource_group.test.location}"
-  resource_group_name          = "${azurerm_resource_group.test.name}"
-  allocation_method = "Static"
-  sku                          = "Standard"
+  name                = "testpip"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  allocation_method   = "Static"
+  sku                 = "Standard"
 }
 
 resource "azurerm_firewall" "test" {
diff --git a/website/docs/r/firewall_network_rule_collection.html.markdown b/website/docs/r/firewall_network_rule_collection.html.markdown
index 9e279c508113..5a6c90a5bab1 100644
--- a/website/docs/r/firewall_network_rule_collection.html.markdown
+++ b/website/docs/r/firewall_network_rule_collection.html.markdown
@@ -34,11 +34,11 @@ resource "azurerm_subnet" "test" {
 }
 
 resource "azurerm_public_ip" "test" {
-  name                         = "testpip"
-  location                     = "${azurerm_resource_group.test.location}"
-  resource_group_name          = "${azurerm_resource_group.test.name}"
-  allocation_method = "Static"
-  sku                          = "Standard"
+  name                = "testpip"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  allocation_method   = "Static"
+  sku                 = "Standard"
 }
 
 resource "azurerm_firewall" "test" {
diff --git a/website/docs/r/hdinsight_hadoop_cluster.html.markdown b/website/docs/r/hdinsight_hadoop_cluster.html.markdown
index 55633a50c976..c677ace1e5ab 100644
--- a/website/docs/r/hdinsight_hadoop_cluster.html.markdown
+++ b/website/docs/r/hdinsight_hadoop_cluster.html.markdown
@@ -64,10 +64,10 @@ resource "azurerm_hdinsight_hadoop_cluster" "example" {
     }
 
     worker_node {
-      vm_size                  = "Standard_D4_V2"
-      username                 = "acctestusrvm"
-      password                 = "AccTestvdSC4daf986!"
-      target_instance_count    = 3
+      vm_size               = "Standard_D4_V2"
+      username              = "acctestusrvm"
+      password              = "AccTestvdSC4daf986!"
+      target_instance_count = 3
     }
 
     zookeeper_node {
diff --git a/website/docs/r/hdinsight_hbase_cluster.html.markdown b/website/docs/r/hdinsight_hbase_cluster.html.markdown
index afec635c1806..d4efaf934f62 100644
--- a/website/docs/r/hdinsight_hbase_cluster.html.markdown
+++ b/website/docs/r/hdinsight_hbase_cluster.html.markdown
@@ -64,10 +64,10 @@ resource "azurerm_hdinsight_hbase_cluster" "example" {
     }
 
     worker_node {
-      vm_size                  = "Standard_D3_V2"
-      username                 = "acctestusrvm"
-      password                 = "AccTestvdSC4daf986!"
-      target_instance_count    = 3
+      vm_size               = "Standard_D3_V2"
+      username              = "acctestusrvm"
+      password              = "AccTestvdSC4daf986!"
+      target_instance_count = 3
     }
 
     zookeeper_node {
diff --git a/website/docs/r/hdinsight_interactive_query_cluster.html.markdown b/website/docs/r/hdinsight_interactive_query_cluster.html.markdown
index 53ffe3ad7ddb..42810fc0e46b 100644
--- a/website/docs/r/hdinsight_interactive_query_cluster.html.markdown
+++ b/website/docs/r/hdinsight_interactive_query_cluster.html.markdown
@@ -64,10 +64,10 @@ resource "azurerm_hdinsight_interactive_query_cluster" "example" {
     }
 
     worker_node {
-      vm_size                  = "Standard_D14_V2"
-      username                 = "acctestusrvm"
-      password                 = "AccTestvdSC4daf986!"
-      target_instance_count    = 3
+      vm_size               = "Standard_D14_V2"
+      username              = "acctestusrvm"
+      password              = "AccTestvdSC4daf986!"
+      target_instance_count = 3
     }
 
     zookeeper_node {
diff --git a/website/docs/r/hdinsight_ml_services_cluster.html.markdown b/website/docs/r/hdinsight_ml_services_cluster.html.markdown
index 1494ca7ee315..02615fc934fc 100644
--- a/website/docs/r/hdinsight_ml_services_cluster.html.markdown
+++ b/website/docs/r/hdinsight_ml_services_cluster.html.markdown
@@ -61,10 +61,10 @@ resource "azurerm_hdinsight_ml_services_cluster" "example" {
     }
 
     worker_node {
-      vm_size                  = "Standard_D4_V2"
-      username                 = "acctestusrvm"
-      password                 = "AccTestvdSC4daf986!"
-      target_instance_count    = 3
+      vm_size               = "Standard_D4_V2"
+      username              = "acctestusrvm"
+      password              = "AccTestvdSC4daf986!"
+      target_instance_count = 3
     }
 
     zookeeper_node {
diff --git a/website/docs/r/hdinsight_rserver_cluster.html.markdown b/website/docs/r/hdinsight_rserver_cluster.html.markdown
index 2a7eddc0909f..502f0fc7ad92 100644
--- a/website/docs/r/hdinsight_rserver_cluster.html.markdown
+++ b/website/docs/r/hdinsight_rserver_cluster.html.markdown
@@ -61,10 +61,10 @@ resource "azurerm_hdinsight_rserver_cluster" "example" {
     }
 
     worker_node {
-      vm_size                  = "Standard_D4_V2"
-      username                 = "acctestusrvm"
-      password                 = "AccTestvdSC4daf986!"
-      target_instance_count    = 3
+      vm_size               = "Standard_D4_V2"
+      username              = "acctestusrvm"
+      password              = "AccTestvdSC4daf986!"
+      target_instance_count = 3
     }
 
     zookeeper_node {
diff --git a/website/docs/r/iot_dps_certificate.html.markdown b/website/docs/r/iot_dps_certificate.html.markdown
index ecbf108e9d1a..0d22fdfc9c1d 100644
--- a/website/docs/r/iot_dps_certificate.html.markdown
+++ b/website/docs/r/iot_dps_certificate.html.markdown
@@ -31,11 +31,11 @@ resource "azurerm_iot_dps" "example" {
 }
 
 resource "azurerm_iot_dps_certificate" "example" {
-	name                = "example"
-	resource_group_name = "${azurerm_resource_group.example.name}"
-	iot_dps_name        = "${azurerm_iot_dps.example.name}"
+  name                = "example"
+  resource_group_name = "${azurerm_resource_group.example.name}"
+  iot_dps_name        = "${azurerm_iot_dps.example.name}"
 
-	certificate_content = "${filebase64("example.cer")}"		
+  certificate_content = "${filebase64("example.cer")}"
 }
 ```
 
diff --git a/website/docs/r/iothub.html.markdown b/website/docs/r/iothub.html.markdown
index ea088ccf92da..12c6a345fcc8 100644
--- a/website/docs/r/iothub.html.markdown
+++ b/website/docs/r/iothub.html.markdown
@@ -64,7 +64,7 @@ resource "azurerm_iothub" "test" {
   }
 
   fallback_route {
-    enabled        = true
+    enabled = true
   }
 
   tags = {
diff --git a/website/docs/r/iothub_shared_access_policy.html.markdown b/website/docs/r/iothub_shared_access_policy.html.markdown
index 6426eced0f7c..83cac4b73908 100644
--- a/website/docs/r/iothub_shared_access_policy.html.markdown
+++ b/website/docs/r/iothub_shared_access_policy.html.markdown
@@ -34,11 +34,10 @@ resource "azurerm_iothub_shared_access_policy" "example" {
   name                = "example"
   resource_group_name = "${azurerm_resource_group.example.name}"
   iothub_name         = "${azurerm_iothub.example.name}"
-  
+
   registry_read  = true
   registry_write = true
 }
-
 ```
 
 ## Argument Reference
diff --git a/website/docs/r/key_vault_access_policy.html.markdown b/website/docs/r/key_vault_access_policy.html.markdown
index cfa6071a68e4..80d24b49b10a 100644
--- a/website/docs/r/key_vault_access_policy.html.markdown
+++ b/website/docs/r/key_vault_access_policy.html.markdown
@@ -41,7 +41,7 @@ resource "azurerm_key_vault" "test" {
 }
 
 resource "azurerm_key_vault_access_policy" "test" {
-  key_vault_id          = "${azurerm_key_vault.test.id}"
+  key_vault_id = "${azurerm_key_vault.test.id}"
 
   tenant_id = "00000000-0000-0000-0000-000000000000"
   object_id = "11111111-1111-1111-1111-111111111111"
diff --git a/website/docs/r/key_vault_certificate.html.markdown b/website/docs/r/key_vault_certificate.html.markdown
index 8d55055f4702..b8459a74a560 100644
--- a/website/docs/r/key_vault_certificate.html.markdown
+++ b/website/docs/r/key_vault_certificate.html.markdown
@@ -89,7 +89,7 @@ resource "azurerm_key_vault" "test" {
 }
 
 resource "azurerm_key_vault_certificate" "test" {
-  name     = "imported-cert"
+  name         = "imported-cert"
   key_vault_id = "${azurerm_key_vault.test.id}"
 
   certificate {
@@ -141,20 +141,48 @@ resource "azurerm_key_vault" "test" {
     object_id = "${data.azurerm_client_config.current.service_principal_object_id}"
 
     certificate_permissions = [
-      "create","delete","deleteissuers",
-      "get","getissuers","import","list",
-      "listissuers","managecontacts","manageissuers",
-      "setissuers","update",
+      "create",
+      "delete",
+      "deleteissuers",
+      "get",
+      "getissuers",
+      "import",
+      "list",
+      "listissuers",
+      "managecontacts",
+      "manageissuers",
+      "setissuers",
+      "update",
     ]
 
     key_permissions = [
-      "backup","create","decrypt","delete","encrypt","get",
-      "import","list","purge","recover","restore","sign",
-      "unwrapKey","update","verify","wrapKey",
+      "backup",
+      "create",
+      "decrypt",
+      "delete",
+      "encrypt",
+      "get",
+      "import",
+      "list",
+      "purge",
+      "recover",
+      "restore",
+      "sign",
+      "unwrapKey",
+      "update",
+      "verify",
+      "wrapKey",
     ]
 
     secret_permissions = [
-      "backup","delete","get","list","purge","recover","restore","set",
+      "backup",
+      "delete",
+      "get",
+      "list",
+      "purge",
+      "recover",
+      "restore",
+      "set",
     ]
   }
 
@@ -164,7 +192,7 @@ resource "azurerm_key_vault" "test" {
 }
 
 resource "azurerm_key_vault_certificate" "test" {
-  name     = "generated-cert"
+  name         = "generated-cert"
   key_vault_id = "${azurerm_key_vault.test.id}"
 
   certificate_policy {
diff --git a/website/docs/r/key_vault_key.html.markdown b/website/docs/r/key_vault_key.html.markdown
index 8b8f64944781..b7bab7cf8316 100644
--- a/website/docs/r/key_vault_key.html.markdown
+++ b/website/docs/r/key_vault_key.html.markdown
@@ -59,10 +59,10 @@ resource "azurerm_key_vault" "test" {
 }
 
 resource "azurerm_key_vault_key" "generated" {
-  name      = "generated-certificate"
+  name         = "generated-certificate"
   key_vault_id = "${azurerm_key_vault.test.id}"
-  key_type  = "RSA"
-  key_size  = 2048
+  key_type     = "RSA"
+  key_size     = 2048
 
   key_opts = [
     "decrypt",
diff --git a/website/docs/r/key_vault_secret.html.markdown b/website/docs/r/key_vault_secret.html.markdown
index 152e8163045b..859753afd62d 100644
--- a/website/docs/r/key_vault_secret.html.markdown
+++ b/website/docs/r/key_vault_secret.html.markdown
@@ -64,8 +64,8 @@ resource "azurerm_key_vault" "test" {
 }
 
 resource "azurerm_key_vault_secret" "test" {
-  name     = "secret-sauce"
-  value    = "szechuan"
+  name         = "secret-sauce"
+  value        = "szechuan"
   key_vault_id = "${azurerm_key_vault.test.id}"
 
   tags = {
diff --git a/website/docs/r/loadbalancer_backend_address_pool.html.markdown b/website/docs/r/loadbalancer_backend_address_pool.html.markdown
index bc68dff334d8..4c230ec9505f 100644
--- a/website/docs/r/loadbalancer_backend_address_pool.html.markdown
+++ b/website/docs/r/loadbalancer_backend_address_pool.html.markdown
@@ -21,10 +21,10 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_public_ip" "test" {
-  name                         = "PublicIPForLB"
-  location                     = "West US"
-  resource_group_name          = "${azurerm_resource_group.test.name}"
-  allocation_method = "Static"
+  name                = "PublicIPForLB"
+  location            = "West US"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  allocation_method   = "Static"
 }
 
 resource "azurerm_lb" "test" {
diff --git a/website/docs/r/loadbalancer_nat_pool.html.markdown b/website/docs/r/loadbalancer_nat_pool.html.markdown
index bb253806d145..10bef32e0bec 100644
--- a/website/docs/r/loadbalancer_nat_pool.html.markdown
+++ b/website/docs/r/loadbalancer_nat_pool.html.markdown
@@ -21,10 +21,10 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_public_ip" "test" {
-  name                         = "PublicIPForLB"
-  location                     = "West US"
-  resource_group_name          = "${azurerm_resource_group.test.name}"
-  allocation_method = "Static"
+  name                = "PublicIPForLB"
+  location            = "West US"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  allocation_method   = "Static"
 }
 
 resource "azurerm_lb" "test" {
diff --git a/website/docs/r/loadbalancer_nat_rule.html.markdown b/website/docs/r/loadbalancer_nat_rule.html.markdown
index 40b289591c60..dbd7af7b9be1 100644
--- a/website/docs/r/loadbalancer_nat_rule.html.markdown
+++ b/website/docs/r/loadbalancer_nat_rule.html.markdown
@@ -21,10 +21,10 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_public_ip" "test" {
-  name                         = "PublicIPForLB"
-  location                     = "West US"
-  resource_group_name          = "${azurerm_resource_group.test.name}"
-  allocation_method = "Static"
+  name                = "PublicIPForLB"
+  location            = "West US"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  allocation_method   = "Static"
 }
 
 resource "azurerm_lb" "test" {
diff --git a/website/docs/r/loadbalancer_outbound_rule.html.markdown b/website/docs/r/loadbalancer_outbound_rule.html.markdown
index 6052cf127f80..2a08b29e791a 100644
--- a/website/docs/r/loadbalancer_outbound_rule.html.markdown
+++ b/website/docs/r/loadbalancer_outbound_rule.html.markdown
@@ -21,10 +21,10 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_public_ip" "test" {
-  name                         = "PublicIPForLB"
-  location                     = "West US"
-  resource_group_name          = "${azurerm_resource_group.test.name}"
-  allocation_method            = "Static"
+  name                = "PublicIPForLB"
+  location            = "West US"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  allocation_method   = "Static"
 }
 
 resource "azurerm_lb" "test" {
@@ -45,11 +45,11 @@ resource "azurerm_lb_backend_address_pool" "test" {
 }
 
 resource "azurerm_lb_outbound_rule" "test" {
-  resource_group_name            = "${azurerm_resource_group.test.name}"
-  loadbalancer_id                = "${azurerm_lb.test.id}"
-  name                           = "OutboundRule"
-  protocol                       = "Tcp"
-  backend_address_pool_id        = "${azurerm_lb_backend_address_pool.test.id}"
+  resource_group_name     = "${azurerm_resource_group.test.name}"
+  loadbalancer_id         = "${azurerm_lb.test.id}"
+  name                    = "OutboundRule"
+  protocol                = "Tcp"
+  backend_address_pool_id = "${azurerm_lb_backend_address_pool.test.id}"
 
   frontend_ip_configuration {
     name = "PublicIPAddress"
diff --git a/website/docs/r/loadbalancer_probe.html.markdown b/website/docs/r/loadbalancer_probe.html.markdown
index d028fc748f93..99ca484b867d 100644
--- a/website/docs/r/loadbalancer_probe.html.markdown
+++ b/website/docs/r/loadbalancer_probe.html.markdown
@@ -21,10 +21,10 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_public_ip" "test" {
-  name                         = "PublicIPForLB"
-  location                     = "West US"
-  resource_group_name          = "${azurerm_resource_group.test.name}"
-  allocation_method = "Static"
+  name                = "PublicIPForLB"
+  location            = "West US"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  allocation_method   = "Static"
 }
 
 resource "azurerm_lb" "test" {
diff --git a/website/docs/r/loadbalancer_rule.html.markdown b/website/docs/r/loadbalancer_rule.html.markdown
index 5f35d28fe5de..2b412c7092fd 100644
--- a/website/docs/r/loadbalancer_rule.html.markdown
+++ b/website/docs/r/loadbalancer_rule.html.markdown
@@ -21,10 +21,10 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_public_ip" "test" {
-  name                         = "PublicIPForLB"
-  location                     = "West US"
-  resource_group_name          = "${azurerm_resource_group.test.name}"
-  allocation_method = "Static"
+  name                = "PublicIPForLB"
+  location            = "West US"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  allocation_method   = "Static"
 }
 
 resource "azurerm_lb" "test" {
diff --git a/website/docs/r/management_group.html.markdown b/website/docs/r/management_group.html.markdown
index 9e48522fd762..c93e71461070 100644
--- a/website/docs/r/management_group.html.markdown
+++ b/website/docs/r/management_group.html.markdown
@@ -16,20 +16,22 @@ Manages a Management Group.
 data "azurerm_subscription" "current" {}
 
 resource "azurerm_management_group" "example_parent" {
-  display_name     = "ParentGroup"
+  display_name = "ParentGroup"
+
   subscription_ids = [
-    "${data.azurerm_subscription.current.subscription_id}"
+    "${data.azurerm_subscription.current.subscription_id}",
   ]
 }
 
 resource "azurerm_management_group" "example_child" {
   display_name               = "ChildGroup"
   parent_management_group_id = "${azurerm_management_group.example_parent.id}"
-  
+
   subscription_ids = [
     "${data.azurerm_subscription.current.subscription_id}",
-    # other subscription IDs can go here
   ]
+
+  # other subscription IDs can go here
 }
 ```
 
diff --git a/website/docs/r/media_services_account.html.markdown b/website/docs/r/media_services_account.html.markdown
index 2da9b975e5eb..6e993b12db7e 100644
--- a/website/docs/r/media_services_account.html.markdown
+++ b/website/docs/r/media_services_account.html.markdown
@@ -72,4 +72,4 @@ Media Services Accounts can be imported using the `resource id`, e.g.
 
 ```shell
 terraform import azurerm_media_services_account.account /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Media/mediaservices/account1
-```
\ No newline at end of file
+```
diff --git a/website/docs/r/mysql_server.html.markdown b/website/docs/r/mysql_server.html.markdown
index 946819d017be..cbb07549ea67 100644
--- a/website/docs/r/mysql_server.html.markdown
+++ b/website/docs/r/mysql_server.html.markdown
@@ -28,9 +28,9 @@ resource "azurerm_mysql_server" "test" {
     name     = "B_Gen5_2"
     capacity = 2
     tier     = "Basic"
-    family = "Gen5"
+    family   = "Gen5"
     capacity = "2"
- }
+  }
 
   storage_profile {
     storage_mb            = 5120
diff --git a/website/docs/r/network_ddos_protection_plan.html.markdown b/website/docs/r/network_ddos_protection_plan.html.markdown
index 7a33e622449c..b3d2cbf2304b 100644
--- a/website/docs/r/network_ddos_protection_plan.html.markdown
+++ b/website/docs/r/network_ddos_protection_plan.html.markdown
@@ -54,4 +54,4 @@ Azure DDoS Protection Plan can be imported using the `resource id`, e.g.
 
 ```shell
 terraform import azurerm_network_ddos_protection_plan.test /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.Network/ddosProtectionPlans/testddospplan
-```
\ No newline at end of file
+```
diff --git a/website/docs/r/network_interface_application_security_group_association.html.markdown b/website/docs/r/network_interface_application_security_group_association.html.markdown
index 876718d64021..c3ec4a94594d 100644
--- a/website/docs/r/network_interface_application_security_group_association.html.markdown
+++ b/website/docs/r/network_interface_application_security_group_association.html.markdown
@@ -48,7 +48,7 @@ resource "azurerm_network_interface" "test" {
     name                           = "testconfiguration1"
     subnet_id                      = "${azurerm_subnet.test.id}"
     private_ip_address_allocation  = "Dynamic"
-    application_security_group_ids = [ "${azurerm_application_security_group.test.id}" ]
+    application_security_group_ids = ["${azurerm_application_security_group.test.id}"]
   }
 }
 
diff --git a/website/docs/r/public_ip_prefix.html.markdown b/website/docs/r/public_ip_prefix.html.markdown
index 90c405f3a24e..35b6056a7ded 100644
--- a/website/docs/r/public_ip_prefix.html.markdown
+++ b/website/docs/r/public_ip_prefix.html.markdown
@@ -25,7 +25,7 @@ resource "azurerm_public_ip_prefix" "test" {
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
 
-  prefix_length   = 31
+  prefix_length = 31
 
   tags = {
     environment = "Production"
diff --git a/website/docs/r/stream_analytics_function_javascript_udf.html.markdown b/website/docs/r/stream_analytics_function_javascript_udf.html.markdown
index 0d96a509917b..c5419a582a83 100644
--- a/website/docs/r/stream_analytics_function_javascript_udf.html.markdown
+++ b/website/docs/r/stream_analytics_function_javascript_udf.html.markdown
@@ -26,6 +26,7 @@ resource "azurerm_stream_analytics_function_javascript_udf" "test" {
   name                      = "example-javascript-function"
   stream_analytics_job_name = "${data.azurerm_stream_analytics_job.example.name}"
   resource_group_name       = "${data.azurerm_stream_analytics_job.example.resource_group_name}"
+
   script = <<SCRIPT
 function getRandomNumber(in) {
   return in;
diff --git a/website/docs/r/stream_analytics_output_eventhub.html.markdown b/website/docs/r/stream_analytics_output_eventhub.html.markdown
index 108a7f68ffb9..e716f7084585 100644
--- a/website/docs/r/stream_analytics_output_eventhub.html.markdown
+++ b/website/docs/r/stream_analytics_output_eventhub.html.markdown
@@ -52,7 +52,6 @@ resource "azurerm_stream_analytics_output_eventhub" "example" {
     type = "Avro"
   }
 }
-
 ```
 
 ## Argument Reference
diff --git a/website/docs/r/stream_analytics_output_mssql.html.markdown b/website/docs/r/stream_analytics_output_mssql.html.markdown
index 143556a07a43..4a83de4346fa 100644
--- a/website/docs/r/stream_analytics_output_mssql.html.markdown
+++ b/website/docs/r/stream_analytics_output_mssql.html.markdown
@@ -1,88 +1,88 @@
----
-layout: "azurerm"
-page_title: "Azure Resource Manager: azurerm_stream_analytics_output_mssql"
-sidebar_current: "docs-azurerm-resource-stream-analytics-output-mssql"
-description: |-
-  Manages a Stream Analytics Output to Microsoft SQL Server Database.
----
-
-# azurerm_stream_analytics_output_mssql
-
-Manages a Stream Analytics Output to Microsoft SQL Server Database.
-
-## Example Usage
-
-```hcl
-data "azurerm_resource_group" "example" {
-  name = "example-resources"
-}
-
-data "azurerm_stream_analytics_job" "example" {
-  name                = "example-job"
-  resource_group_name = "${azurerm_resource_group.example.name}"
-}
-
-resource "azurerm_sql_server" "example" {
-  name                         = "example-server"
-  resource_group_name          = "${azurerm_resource_group.example.name}"
-  location                     = "${azurerm_resource_group.example.location}"
-  version                      = "12.0"
-  administrator_login          = "dbadmin"
-  administrator_login_password = "example-password"
-}
-
-resource "azurerm_sql_database" "example" {
-  name                             = "exampledb"
-  resource_group_name              = "${azurerm_resource_group.example.name}"
-  location                         = "${azurerm_resource_group.example.location}"
-  server_name                      = "${azurerm_sql_server.example.name}"
-  requested_service_objective_name = "S0"
-  collation                        = "SQL_LATIN1_GENERAL_CP1_CI_AS"
-  max_size_bytes                   = "268435456000"
-  create_mode                      = "Default"
-}
-
-resource "azurerm_stream_analytics_output_mssql" "example" {
-  name                      = "example-output-sql"
-  stream_analytics_job_name = "${azurerm_stream_analytics_job.example.name}"
-  resource_group_name       = "${azurerm_stream_analytics_job.example.resource_group_name}"
-
-  server                    = "${azurerm_sql_server.example.fully_qualified_domain_name}"
-  user                      = "${azurerm_sql_server.example.administrator_login}"
-  password                  = "${azurerm_sql_server.example.administrator_login_password}"
-  database                  = "${azurerm_sql_database.example.name}"
-  table                     = "ExampleTable"
-}
-```
-
-## Argument Reference
-
-The following arguments are supported:
-
-* `name` - (Required) The name of the Stream Output. Changing this forces a new resource to be created.
-
-* `resource_group_name` - (Required) The name of the Resource Group where the Stream Analytics Job exists. Changing this forces a new resource to be created.
-
-* `stream_analytics_job_name` - (Required) The name of the Stream Analytics Job. Changing this forces a new resource to be created.
-
-* `server` - (Required) The SQL server url. Changing this forces a new resource to be created.
-
-* `user` - (Required) Username used to login to the Microsoft SQL Server. Changing this forces a new resource to be created.
-
-* `password` - (Required) Password used together with username, to login to the Microsoft SQL Server. Changing this forces a new resource to be created.
-
-* `table` - (Required) Table in the database that the output points to. Changing this forces a new resource to be created.
-
-## Attributes Reference
-
-The following attributes are exported in addition to the arguments listed above:
-
-* `id` - The ID of the Stream Analytics Output Microsoft SQL Server Database.
-
-## Import
-
-Stream Analytics Outputs to Microsoft SQL Server Database can be imported using the `resource id`, e.g.
-
-```shell
-terraform import azurerm_stream_analytics_output_mssql.test /subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/group1/providers/Microsoft.StreamAnalytics/streamingjobs/job1/outputs/output1
-```
+---
+layout: "azurerm"
+page_title: "Azure Resource Manager: azurerm_stream_analytics_output_mssql"
+sidebar_current: "docs-azurerm-resource-stream-analytics-output-mssql"
+description: |-
+  Manages a Stream Analytics Output to Microsoft SQL Server Database.
+---
+
+# azurerm_stream_analytics_output_mssql
+
+Manages a Stream Analytics Output to Microsoft SQL Server Database.
+
+## Example Usage
+
+```hcl
+data "azurerm_resource_group" "example" {
+  name = "example-resources"
+}
+
+data "azurerm_stream_analytics_job" "example" {
+  name                = "example-job"
+  resource_group_name = "${azurerm_resource_group.example.name}"
+}
+
+resource "azurerm_sql_server" "example" {
+  name                         = "example-server"
+  resource_group_name          = "${azurerm_resource_group.example.name}"
+  location                     = "${azurerm_resource_group.example.location}"
+  version                      = "12.0"
+  administrator_login          = "dbadmin"
+  administrator_login_password = "example-password"
+}
+
+resource "azurerm_sql_database" "example" {
+  name                             = "exampledb"
+  resource_group_name              = "${azurerm_resource_group.example.name}"
+  location                         = "${azurerm_resource_group.example.location}"
+  server_name                      = "${azurerm_sql_server.example.name}"
+  requested_service_objective_name = "S0"
+  collation                        = "SQL_LATIN1_GENERAL_CP1_CI_AS"
+  max_size_bytes                   = "268435456000"
+  create_mode                      = "Default"
+}
+
+resource "azurerm_stream_analytics_output_mssql" "example" {
+  name                      = "example-output-sql"
+  stream_analytics_job_name = "${azurerm_stream_analytics_job.example.name}"
+  resource_group_name       = "${azurerm_stream_analytics_job.example.resource_group_name}"
+
+  server   = "${azurerm_sql_server.example.fully_qualified_domain_name}"
+  user     = "${azurerm_sql_server.example.administrator_login}"
+  password = "${azurerm_sql_server.example.administrator_login_password}"
+  database = "${azurerm_sql_database.example.name}"
+  table    = "ExampleTable"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `name` - (Required) The name of the Stream Output. Changing this forces a new resource to be created.
+
+* `resource_group_name` - (Required) The name of the Resource Group where the Stream Analytics Job exists. Changing this forces a new resource to be created.
+
+* `stream_analytics_job_name` - (Required) The name of the Stream Analytics Job. Changing this forces a new resource to be created.
+
+* `server` - (Required) The SQL server url. Changing this forces a new resource to be created.
+
+* `user` - (Required) Username used to login to the Microsoft SQL Server. Changing this forces a new resource to be created.
+
+* `password` - (Required) Password used together with username, to login to the Microsoft SQL Server. Changing this forces a new resource to be created.
+
+* `table` - (Required) Table in the database that the output points to. Changing this forces a new resource to be created.
+
+## Attributes Reference
+
+The following attributes are exported in addition to the arguments listed above:
+
+* `id` - The ID of the Stream Analytics Output Microsoft SQL Server Database.
+
+## Import
+
+Stream Analytics Outputs to Microsoft SQL Server Database can be imported using the `resource id`, e.g.
+
+```shell
+terraform import azurerm_stream_analytics_output_mssql.test /subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/group1/providers/Microsoft.StreamAnalytics/streamingjobs/job1/outputs/output1
+```
diff --git a/website/docs/r/stream_analytics_stream_input_blob.html.markdown b/website/docs/r/stream_analytics_stream_input_blob.html.markdown
index 46eca7f854ed..46b7d61133c0 100644
--- a/website/docs/r/stream_analytics_stream_input_blob.html.markdown
+++ b/website/docs/r/stream_analytics_stream_input_blob.html.markdown
@@ -38,15 +38,15 @@ resource "azurerm_storage_container" "example" {
 }
 
 resource "azurerm_stream_analytics_stream_input_eventhub" "test" {
-  name                         = "eventhub-stream-input"
-  stream_analytics_job_name    = "${data.azurerm_stream_analytics_job.example.name}"
-  resource_group_name          = "${data.azurerm_stream_analytics_job.example.resource_group_name}"
-  storage_account_name         = "${azurerm_storage_account.example.name}"
-  storage_account_key          = "${azurerm_storage_account.example.primary_access_key}"
-  storage_container_name       = "${azurerm_storage_container.example.name}"
-  path_pattern                 = "some-random-pattern"
-  date_format                  = "yyyy/MM/dd"
-  time_format                  = "HH"
+  name                      = "eventhub-stream-input"
+  stream_analytics_job_name = "${data.azurerm_stream_analytics_job.example.name}"
+  resource_group_name       = "${data.azurerm_stream_analytics_job.example.resource_group_name}"
+  storage_account_name      = "${azurerm_storage_account.example.name}"
+  storage_account_key       = "${azurerm_storage_account.example.primary_access_key}"
+  storage_container_name    = "${azurerm_storage_container.example.name}"
+  path_pattern              = "some-random-pattern"
+  date_format               = "yyyy/MM/dd"
+  time_format               = "HH"
 
   serialization {
     type     = "Json"
diff --git a/website/docs/r/stream_analytics_stream_input_iothub.html.markdown b/website/docs/r/stream_analytics_stream_input_iothub.html.markdown
index 0d0386d33ac8..538ad464bc1f 100644
--- a/website/docs/r/stream_analytics_stream_input_iothub.html.markdown
+++ b/website/docs/r/stream_analytics_stream_input_iothub.html.markdown
@@ -22,7 +22,6 @@ data "azurerm_stream_analytics_job" "example" {
   resource_group_name = "${azurerm_resource_group.example.name}"
 }
 
-
 resource "azurerm_iothub" "test" {
   name                = "example-iothub"
   resource_group_name = "${azurerm_resource_group.example.name}"
diff --git a/website/docs/r/subnet.html.markdown b/website/docs/r/subnet.html.markdown
index 046e3d70afd0..4b88ca30f3e2 100644
--- a/website/docs/r/subnet.html.markdown
+++ b/website/docs/r/subnet.html.markdown
@@ -35,8 +35,10 @@ resource "azurerm_subnet" "test" {
   resource_group_name  = "${azurerm_resource_group.test.name}"
   virtual_network_name = "${azurerm_virtual_network.test.name}"
   address_prefix       = "10.0.1.0/24"
+
   delegation {
     name = "acctestdelegation"
+
     service_delegation {
       name    = "Microsoft.ContainerInstance/containerGroups"
       actions = ["Microsoft.Network/virtualNetworks/subnets/action"]
diff --git a/website/docs/r/virtual_network.html.markdown b/website/docs/r/virtual_network.html.markdown
index c73e4c518a3e..7c08d34fe5ce 100644
--- a/website/docs/r/virtual_network.html.markdown
+++ b/website/docs/r/virtual_network.html.markdown
@@ -41,7 +41,7 @@ resource "azurerm_virtual_network" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   address_space       = ["10.0.0.0/16"]
   dns_servers         = ["10.0.0.4", "10.0.0.5"]
-  
+
   ddos_protection_plan {
     id     = "${azurerm_ddos_protection_plan.test.id}"
     enable = true