From fcb56295db8de4740cda1605f2b246da179d27e5 Mon Sep 17 00:00:00 2001
From: kt <kt@katbyte.me>
Date: Fri, 25 Oct 2019 09:23:18 -0700
Subject: [PATCH 1/5] first pass

---
 azurerm/data_source_batch_account_test.go     |  70 +--
 azurerm/data_source_batch_pool_test.go        |   2 +-
 ...ta_source_dev_test_virtual_network_test.go |  32 +-
 .../data_source_express_route_circuit_test.go |   8 +-
 azurerm/data_source_resources_test.go         |  16 +-
 azurerm/data_source_sql_database_test.go      |  18 +-
 ...a_source_storage_management_policy_test.go |  30 +-
 ...ource_arm_analysis_services_server_test.go |  74 ++--
 azurerm/resource_arm_api_management_test.go   |   8 +-
 ..._arm_app_service_certificate_order_test.go |  34 +-
 ...source_arm_app_service_certificate_test.go |   2 +-
 azurerm/resource_arm_app_service_slot_test.go |  30 +-
 azurerm/resource_arm_app_service_test.go      |  16 +-
 .../resource_arm_application_gateway_test.go  |  26 +-
 .../resource_arm_automation_account_test.go   |   4 +-
 azurerm/resource_arm_availability_set_test.go |   2 +-
 azurerm/resource_arm_bastion_host_test.go     |   6 +-
 azurerm/resource_arm_batch_account_test.go    |  24 +-
 .../resource_arm_batch_application_test.go    |   4 +-
 azurerm/resource_arm_batch_pool_test.go       |   8 +-
 azurerm/resource_arm_bot_connection_test.go   |   4 +-
 azurerm/resource_arm_container_group_test.go  |   2 +-
 .../resource_arm_container_registry_test.go   |   4 +-
 ...rce_arm_container_registry_webhook_test.go | 194 ++++-----
 ...esource_arm_cosmosdb_sql_container_test.go |   2 +-
 azurerm/resource_arm_dashboard_test.go        |  22 +-
 ...actory_integration_runtime_managed_test.go |   4 +-
 ...resource_arm_dev_test_lab_schedule_test.go | 262 ++++++------
 ...namespace_disaster_recovery_config_test.go |  26 +-
 azurerm/resource_arm_firewall_test.go         |   2 +-
 ...rce_arm_front_door_firewall_policy_test.go |   4 +-
 azurerm/resource_arm_front_door_test.go       |  36 +-
 .../resource_arm_healthcare_service_test.go   |  16 +-
 azurerm/resource_arm_iothub_test.go           |  12 +-
 azurerm/resource_arm_key_vault_test.go        |   2 +-
 .../resource_arm_kubernetes_cluster_test.go   |  54 +--
 azurerm/resource_arm_kusto_cluster_test.go    |   8 +-
 ...arm_kusto_eventhub_data_connection_test.go |   4 +-
 ...nux_virtual_machine_scale_set_auth_test.go |  15 +-
 ...irtual_machine_scale_set_disk_data_test.go | 113 ++---
 ..._virtual_machine_scale_set_disk_os_test.go |  75 ++--
 ...virtual_machine_scale_set_identity_test.go |  66 +--
 ...x_virtual_machine_scale_set_images_test.go | 116 ++---
 ..._virtual_machine_scale_set_network_test.go | 398 +++++++++---------
 ...ux_virtual_machine_scale_set_other_test.go | 219 +++++-----
 ..._virtual_machine_scale_set_scaling_test.go | 183 ++++----
 azurerm/resource_arm_mariadb_server_test.go   |   2 +-
 .../resource_arm_monitor_action_group_test.go |  12 +-
 ...rce_arm_monitor_diagnostic_setting_test.go |   6 +-
 azurerm/resource_arm_mysql_server_test.go     |   2 +-
 ...otification_hub_authorization_rule_test.go |  24 +-
 ...vate_dns_zone_virtual_network_link_test.go |  22 +-
 ...ource_arm_recovery_services_fabric_test.go |   8 +-
 ..._recovery_services_network_mapping_test.go |  46 +-
 ...arm_recovery_services_protected_vm_test.go |  12 +-
 ...vices_protection_container_mapping_test.go |  54 +--
 ...very_services_protection_container_test.go |  16 +-
 ...rm_recovery_services_replicated_vm_test.go | 140 +++---
 azurerm/resource_arm_redis_cache_test.go      |  30 +-
 azurerm/resource_arm_sql_database_test.go     |   2 +-
 .../resource_arm_sql_failover_group_test.go   |  30 +-
 azurerm/resource_arm_storage_account_test.go  |   4 +-
 azurerm/resource_arm_storage_blob_test.go     |   4 +-
 ...urce_arm_storage_management_policy_test.go | 240 +++++------
 .../resource_arm_storage_table_entity_test.go |  10 +-
 .../resource_arm_stream_analytics_job_test.go |   6 +-
 ...ource_arm_traffic_manager_endpoint_test.go |   8 +-
 ...urce_arm_virtual_machine_scale_set_test.go |  14 +-
 azurerm/resource_arm_virtual_machine_test.go  |   2 +-
 ...irtual_machine_scale_set_disk_data_test.go |   8 +-
 ...virtual_machine_scale_set_identity_test.go |   6 +-
 ...s_virtual_machine_scale_set_images_test.go |  44 +-
 ..._virtual_machine_scale_set_network_test.go |  68 +--
 ...ws_virtual_machine_scale_set_other_test.go | 164 ++++----
 ..._virtual_machine_scale_set_scaling_test.go | 170 ++++----
 75 files changed, 1741 insertions(+), 1670 deletions(-)

diff --git a/azurerm/data_source_batch_account_test.go b/azurerm/data_source_batch_account_test.go
index 4419f433970c..10ba4eabf343 100644
--- a/azurerm/data_source_batch_account_test.go
+++ b/azurerm/data_source_batch_account_test.go
@@ -145,54 +145,54 @@ data "azurerm_batch_account" "test" {
 func testAccDataSourceAzureBatchAccount_userSubscription(rInt int, rString string, location string, tenantID string, subscriptionID string) string {
 	return fmt.Sprintf(`
 data "azurerm_azuread_service_principal" "test" {
-	display_name = "Microsoft Azure Batch"
+  display_name = "Microsoft Azure Batch"
 }
 
 resource "azurerm_resource_group" "test" {
-	name     = "testaccRG-%d-batchaccount"
-	location = "%s"
+  name     = "testaccRG-%d-batchaccount"
+  location = "%s"
 }
 
 resource "azurerm_key_vault" "test" {
-	name                            = "batchkv%s"
-	location                        = "${azurerm_resource_group.test.location}"
-	resource_group_name             = "${azurerm_resource_group.test.name}"
-	enabled_for_disk_encryption     = true
-	enabled_for_deployment          = true
-	enabled_for_template_deployment = true
-	tenant_id                       = "%s"
-
-	sku {
-		name = "standard"
-	}
-
-	access_policy {
-		tenant_id = "%s"
-		object_id = "${data.azurerm_azuread_service_principal.test.object_id}"
-		
-		secret_permissions = [
-			"get",
-			"list",
-			"set",
-			"delete"
-		]
-		
-	}
+  name                            = "batchkv%s"
+  location                        = "${azurerm_resource_group.test.location}"
+  resource_group_name             = "${azurerm_resource_group.test.name}"
+  enabled_for_disk_encryption     = true
+  enabled_for_deployment          = true
+  enabled_for_template_deployment = true
+  tenant_id                       = "%s"
+
+  sku {
+    name = "standard"
+  }
+
+  access_policy {
+    tenant_id = "%s"
+    object_id = "${data.azurerm_azuread_service_principal.test.object_id}"
+
+    secret_permissions = [
+      "get",
+      "list",
+      "set",
+      "delete"
+    ]
+
+  }
 }
 
 resource "azurerm_role_assignment" "contribrole" {
-	scope                = "/subscriptions/%s"
-	role_definition_name = "Contributor"
-	principal_id         = "${data.azurerm_azuread_service_principal.test.object_id}"
+  scope                = "/subscriptions/%s"
+  role_definition_name = "Contributor"
+  principal_id         = "${data.azurerm_azuread_service_principal.test.object_id}"
 }
 
 resource "azurerm_batch_account" "test" {
-  name                 = "testaccbatch%s"
-  resource_group_name  = "${azurerm_resource_group.test.name}"
-  location             = "${azurerm_resource_group.test.location}"
-  
+  name                = "testaccbatch%s"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  location            = "${azurerm_resource_group.test.location}"
+
   pool_allocation_mode = "UserSubscription"
-  
+
   key_vault_reference {
     id  = "${azurerm_key_vault.test.id}"
     url = "${azurerm_key_vault.test.vault_uri}"
diff --git a/azurerm/data_source_batch_pool_test.go b/azurerm/data_source_batch_pool_test.go
index 5d5d20ff2530..9dc43adad578 100644
--- a/azurerm/data_source_batch_pool_test.go
+++ b/azurerm/data_source_batch_pool_test.go
@@ -129,7 +129,7 @@ resource "azurerm_batch_pool" "test" {
 
   container_configuration {
     type = "DockerCompatible"
-    container_registries= [
+    container_registries = [
       {
         registry_server = "myContainerRegistry.azurecr.io"
         user_name       = "myUserName"
diff --git a/azurerm/data_source_dev_test_virtual_network_test.go b/azurerm/data_source_dev_test_virtual_network_test.go
index 8a794b56edc6..c333f6da4a50 100644
--- a/azurerm/data_source_dev_test_virtual_network_test.go
+++ b/azurerm/data_source_dev_test_virtual_network_test.go
@@ -48,31 +48,31 @@ func TestAccDataSourceArmDevTestVirtualNetwork_basic(t *testing.T) {
 func testAccDataSourceArmDevTestVirtualNetwork_basic(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_dev_test_lab" "test" {
-	name                = "acctestdtl%d"
-	location            = "${azurerm_resource_group.test.location}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
+  name                = "acctestdtl%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
 resource "azurerm_dev_test_virtual_network" "test" {
-	name                = "acctestdtvn%d"
-	lab_name            = "${azurerm_dev_test_lab.test.name}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
-  
-	subnet {
-	  use_public_ip_address           = "Allow"
-	  use_in_virtual_machine_creation = "Allow"
-	}
+  name                = "acctestdtvn%d"
+  lab_name            = "${azurerm_dev_test_lab.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+
+  subnet {
+    use_public_ip_address           = "Allow"
+    use_in_virtual_machine_creation = "Allow"
+  }
 }
 
 data "azurerm_dev_test_virtual_network" "test" {
-	name                = "${azurerm_dev_test_virtual_network.test.name}"
-	lab_name            = "${azurerm_dev_test_lab.test.name}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
+  name                = "${azurerm_dev_test_virtual_network.test.name}"
+  lab_name            = "${azurerm_dev_test_lab.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
 
diff --git a/azurerm/data_source_express_route_circuit_test.go b/azurerm/data_source_express_route_circuit_test.go
index 6f7ff8138f96..7189b8ad99a1 100644
--- a/azurerm/data_source_express_route_circuit_test.go
+++ b/azurerm/data_source_express_route_circuit_test.go
@@ -39,9 +39,9 @@ func testAccDataSourceAzureRMExpressRoute_basic(rInt int, location string) strin
 	return fmt.Sprintf(`
 	%s
 
-	data "azurerm_express_route_circuit" test {
-		resource_group_name = "${azurerm_resource_group.test.name}"
-  		name                = "${azurerm_express_route_circuit.test.name}"
-	}
+data "azurerm_express_route_circuit" test {
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  name                = "${azurerm_express_route_circuit.test.name}"
+}
 `, config)
 }
diff --git a/azurerm/data_source_resources_test.go b/azurerm/data_source_resources_test.go
index 79356cd04651..98532776c155 100644
--- a/azurerm/data_source_resources_test.go
+++ b/azurerm/data_source_resources_test.go
@@ -107,7 +107,7 @@ func testAccDataSourceAzureRMResources_ByName(rInt int, rString string, location
 %s
 
 data "azurerm_resources" "test" {
-  name	= "${azurerm_storage_account.test.name}"
+  name = "${azurerm_storage_account.test.name}"
 }
 `, r)
 }
@@ -129,8 +129,8 @@ func testAccDataSourceAzureRMResources_ByResourceType(rInt int, rString string,
 %s
 
 data "azurerm_resources" "test" {
-	resource_group_name = "${azurerm_storage_account.test.resource_group_name}"
-  type 								= "Microsoft.Storage/storageAccounts"
+  resource_group_name = "${azurerm_storage_account.test.resource_group_name}"
+  type                = "Microsoft.Storage/storageAccounts"
 }
 `, r)
 }
@@ -142,11 +142,11 @@ func testAccDataSourceAzureRMResources_FilteredByTags(rInt int, rString string,
 
 data "azurerm_resources" "test" {
   name                = "${azurerm_storage_account.test.name}"
-	resource_group_name = "${azurerm_storage_account.test.resource_group_name}"
-	
-	required_tags = {
-		environment = "production"
-	}
+  resource_group_name = "${azurerm_storage_account.test.resource_group_name}"
+
+  required_tags = {
+    environment = "production"
+  }
 }
 `, r)
 }
diff --git a/azurerm/data_source_sql_database_test.go b/azurerm/data_source_sql_database_test.go
index f5d9340bdd35..c77ac67b2ebc 100644
--- a/azurerm/data_source_sql_database_test.go
+++ b/azurerm/data_source_sql_database_test.go
@@ -92,9 +92,9 @@ func testAccDataSourceAzureRMSqlDatabase_basic(rInt int, location string) string
 %s
 
 data "azurerm_sql_database" "test" {
-	name                = "${azurerm_sql_database.test.name}"
-	server_name         = "${azurerm_sql_database.test.server_name}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
+  name                = "${azurerm_sql_database.test.name}"
+  server_name         = "${azurerm_sql_database.test.server_name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 }
 `, template)
 }
@@ -105,9 +105,9 @@ func testAccDataSourceAzureRMSqlDatabase_elasticPool(rInt int, location string)
 %s
 
 data "azurerm_sql_database" "test" {
-	name                = "${azurerm_sql_database.test.name}"
-	server_name         = "${azurerm_sql_database.test.server_name}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
+  name                = "${azurerm_sql_database.test.name}"
+  server_name         = "${azurerm_sql_database.test.server_name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 }
 `, template)
 }
@@ -118,9 +118,9 @@ func testAccDataSourceAzureRMSqlDatabase_readScale(rInt int, location string, re
 %s
 
 data "azurerm_sql_database" "test" {
-	name                = "${azurerm_sql_database.test.name}"
-	server_name         = "${azurerm_sql_database.test.server_name}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
+  name                = "${azurerm_sql_database.test.name}"
+  server_name         = "${azurerm_sql_database.test.server_name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 }
 `, template)
 }
diff --git a/azurerm/data_source_storage_management_policy_test.go b/azurerm/data_source_storage_management_policy_test.go
index 4a561619dd47..64c66ae83aaf 100644
--- a/azurerm/data_source_storage_management_policy_test.go
+++ b/azurerm/data_source_storage_management_policy_test.go
@@ -64,24 +64,24 @@ resource "azurerm_storage_account" "testsa" {
 
 resource "azurerm_storage_management_policy" "testpolicy" {
   storage_account_id = "${azurerm_storage_account.testsa.id}"
-  
+
   rule {
-	name    = "rule1"
-	enabled = true
-	filters {
-	  prefix_match = [ "container1/prefix1" ]
-	  blob_types   = [ "blockBlob" ]
-	}
-	actions {
+    name    = "rule1"
+    enabled = true
+    filters {
+      prefix_match = ["container1/prefix1"]
+      blob_types   = ["blockBlob"]
+    }
+    actions {
       base_blob {
         tier_to_cool_after_days_since_modification_greater_than    = 10
-		tier_to_archive_after_days_since_modification_greater_than = 50
-		delete_after_days_since_modification_greater_than          = 100
-	  }
-	  snapshot {
-	    delete_after_days_since_creation_greater_than = 30
-	  }
-	}
+        tier_to_archive_after_days_since_modification_greater_than = 50
+        delete_after_days_since_modification_greater_than          = 100
+      }
+      snapshot {
+        delete_after_days_since_creation_greater_than = 30
+      }
+    }
   }
 }
 
diff --git a/azurerm/resource_arm_analysis_services_server_test.go b/azurerm/resource_arm_analysis_services_server_test.go
index f1817a698b46..6cfdb9e75596 100644
--- a/azurerm/resource_arm_analysis_services_server_test.go
+++ b/azurerm/resource_arm_analysis_services_server_test.go
@@ -250,7 +250,7 @@ resource "azurerm_analysis_services_server" "test" {
   name                = "acctestass%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  sku 				  = "B1"
+  sku                 = "B1"
 }
 `, rInt, location, rInt)
 }
@@ -266,10 +266,10 @@ resource "azurerm_analysis_services_server" "test" {
   name                = "acctestass%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  sku 				  = "B1"
+  sku                 = "B1"
 
   tags = {
-	label = "test"
+    label = "test"
   }
 }
 `, rInt, location, rInt)
@@ -286,11 +286,11 @@ resource "azurerm_analysis_services_server" "test" {
   name                = "acctestass%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  sku 				  = "B1"
+  sku                 = "B1"
 
   tags = {
-	label = "test1"
-	ENV   = "prod"
+    label = "test1"
+    ENV   = "prod"
   }
 }
 `, rInt, location, rInt)
@@ -304,10 +304,10 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_analysis_services_server" "test" {
-  name                		= "acctestass%d"
-  location            		= "${azurerm_resource_group.test.location}"
-  resource_group_name 		= "${azurerm_resource_group.test.name}"
-  sku 				  		= "B1"
+  name                      = "acctestass%d"
+  location                  = "${azurerm_resource_group.test.location}"
+  resource_group_name       = "${azurerm_resource_group.test.name}"
+  sku                       = "B1"
   querypool_connection_mode = "%s"
 }
 `, rInt, location, rInt, connectionMode)
@@ -321,11 +321,11 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_analysis_services_server" "test" {
-  name                		= "acctestass%d"
-  location            		= "${azurerm_resource_group.test.location}"
-  resource_group_name 		= "${azurerm_resource_group.test.name}"
-  sku 				  		= "B1"
-  enable_power_bi_service   = %t
+  name                    = "acctestass%d"
+  location                = "${azurerm_resource_group.test.location}"
+  resource_group_name     = "${azurerm_resource_group.test.name}"
+  sku                     = "B1"
+  enable_power_bi_service = %t
 }
 `, rInt, location, rInt, enablePowerBIService)
 }
@@ -338,12 +338,12 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_analysis_services_server" "test" {
-  name                		= "acctestass%d"
-  location            		= "${azurerm_resource_group.test.location}"
-  resource_group_name 		= "${azurerm_resource_group.test.name}"
-  sku 				  		= "B1"
-  enable_power_bi_service   = %t
-  
+  name                    = "acctestass%d"
+  location                = "${azurerm_resource_group.test.location}"
+  resource_group_name     = "${azurerm_resource_group.test.name}"
+  sku                     = "B1"
+  enable_power_bi_service = %t
+
   ipv4_firewall_rule {
     name        = "test1"
     range_start = "92.123.234.11"
@@ -361,12 +361,12 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_analysis_services_server" "test" {
-  name                		= "acctestass%d"
-  location            		= "${azurerm_resource_group.test.location}"
-  resource_group_name 		= "${azurerm_resource_group.test.name}"
-  sku 				  		= "B1"
-  enable_power_bi_service   = %t
-  
+  name                    = "acctestass%d"
+  location                = "${azurerm_resource_group.test.location}"
+  resource_group_name     = "${azurerm_resource_group.test.name}"
+  sku                     = "B1"
+  enable_power_bi_service = %t
+
   ipv4_firewall_rule {
     name        = "test1"
     range_start = "92.123.234.11"
@@ -385,16 +385,16 @@ resource "azurerm_analysis_services_server" "test" {
 func testAccAzureRMAnalysisServicesServer_adminUsers(rInt int, location string, adminUsers []string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {
- name     = "acctestRG-%d"
- location = "%s"
+  name     = "acctestRG-%d"
+  location = "%s"
 }
 
 resource "azurerm_analysis_services_server" "test" {
- name                		= "acctestass%d"
- location            		= "${azurerm_resource_group.test.location}"
- resource_group_name 		= "${azurerm_resource_group.test.name}"
- sku 				  		= "B1"
- admin_users 				= ["%s"]
+  name                = "acctestass%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  sku                 = "B1"
+  admin_users         = ["%s"]
 }
 `, rInt, location, rInt, strings.Join(adminUsers, "\", \""))
 }
@@ -410,7 +410,7 @@ resource "azurerm_analysis_services_server" "test" {
   name                = "acctestass%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  sku 				  = "B1"
+  sku                 = "B1"
 }
 `, rInt, location, rInt)
 }
@@ -426,7 +426,7 @@ resource "azurerm_storage_account" "test" {
   name                     = "acctestass%s"
   resource_group_name      = "${azurerm_resource_group.test.name}"
   location                 = "${azurerm_resource_group.test.location}"
-  account_kind			   = "BlobStorage"
+  account_kind             = "BlobStorage"
   account_tier             = "Standard"
   account_replication_type = "LRS"
 }
@@ -459,7 +459,7 @@ resource "azurerm_analysis_services_server" "test" {
   name                = "acctestass%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  sku 				  = "B1"
+  sku                 = "B1"
 
   backup_blob_container_uri = "${azurerm_storage_account.test.primary_blob_endpoint}${azurerm_storage_container.test.name}${data.azurerm_storage_account_blob_container_sas.test.sas}"
 }
diff --git a/azurerm/resource_arm_api_management_test.go b/azurerm/resource_arm_api_management_test.go
index 748e4e0b6f62..ae2dd9148b39 100644
--- a/azurerm/resource_arm_api_management_test.go
+++ b/azurerm/resource_arm_api_management_test.go
@@ -337,9 +337,9 @@ resource "azurerm_api_management" "test" {
   publisher_email     = "pub1@email.com"
 
   sku {
-    name = "Developer"
+    name     = "Developer"
     capacity = 1
-	}
+  }
 }
 `, rInt, location, rInt)
 }
@@ -522,8 +522,8 @@ resource "azurerm_resource_group" "test2" {
 }
 
 resource "azurerm_resource_group" "test3" {
-	name     = "acctestRG3-%d"
-	location = "%s"
+  name     = "acctestRG3-%d"
+  location = "%s"
 }
 
 resource "azurerm_api_management" "test" {
diff --git a/azurerm/resource_arm_app_service_certificate_order_test.go b/azurerm/resource_arm_app_service_certificate_order_test.go
index b23ae93535aa..478976a11156 100644
--- a/azurerm/resource_arm_app_service_certificate_order_test.go
+++ b/azurerm/resource_arm_app_service_certificate_order_test.go
@@ -267,11 +267,11 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_app_service_certificate_order" "test" {
-  name = "acctestASCO-%d"
-  location = "global"
+  name                = "acctestASCO-%d"
+  location            = "global"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  distinguished_name = "CN=example.com"
-  product_type = "Standard"
+  distinguished_name  = "CN=example.com"
+  product_type        = "Standard"
 }
 `, rInt, location, rInt)
 }
@@ -284,11 +284,11 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_app_service_certificate_order" "test" {
-  name = "acctestASCO-%d"
-  location = "global"
+  name                = "acctestASCO-%d"
+  location            = "global"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  distinguished_name = "CN=*.example.com"
-  product_type = "WildCard"
+  distinguished_name  = "CN=*.example.com"
+  product_type        = "WildCard"
 }
 `, rInt, location, rInt)
 }
@@ -302,8 +302,8 @@ resource "azurerm_app_service_certificate_order" "import" {
   name                = "${azurerm_app_service_certificate_order.test.name}"
   location            = "${azurerm_app_service_certificate_order.test.location}"
   resource_group_name = "${azurerm_app_service_certificate_order.test.resource_group_name}"
-  distinguished_name = "${azurerm_app_service_certificate_order.test.distinguished_name}"
-  product_type = "${azurerm_app_service_certificate_order.test.product_type}"
+  distinguished_name  = "${azurerm_app_service_certificate_order.test.distinguished_name}"
+  product_type        = "${azurerm_app_service_certificate_order.test.product_type}"
 }
 `, template)
 }
@@ -316,14 +316,14 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_app_service_certificate_order" "test" {
-  name = "acctestASCO-%d"
-  location = "global"
+  name                = "acctestASCO-%d"
+  location            = "global"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  distinguished_name = "CN=example.com"
-  product_type = "Standard"
-  auto_renew = false
-  validity_in_years = 1
-  key_size = %d
+  distinguished_name  = "CN=example.com"
+  product_type        = "Standard"
+  auto_renew          = false
+  validity_in_years   = 1
+  key_size            = %d
 }
 `, rInt, location, rInt, keySize)
 }
diff --git a/azurerm/resource_arm_app_service_certificate_test.go b/azurerm/resource_arm_app_service_certificate_test.go
index 314e58161996..c0d6b6c29dee 100644
--- a/azurerm/resource_arm_app_service_certificate_test.go
+++ b/azurerm/resource_arm_app_service_certificate_test.go
@@ -152,7 +152,7 @@ resource "azurerm_key_vault" "test" {
 
   access_policy {
     tenant_id               = data.azurerm_client_config.test.tenant_id
-    object_id               = data.azurerm_client_config.test.service_principal_object_id 
+    object_id               = data.azurerm_client_config.test.service_principal_object_id
     secret_permissions      = ["delete", "get", "set"]
     certificate_permissions = ["create", "delete", "get", "import"]
   }
diff --git a/azurerm/resource_arm_app_service_slot_test.go b/azurerm/resource_arm_app_service_slot_test.go
index d5923f9cd171..b901280f216f 100644
--- a/azurerm/resource_arm_app_service_slot_test.go
+++ b/azurerm/resource_arm_app_service_slot_test.go
@@ -2005,8 +2005,8 @@ resource "azurerm_app_service" "test" {
   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 {
+
+  site_config {
     always_on = true
   }
 }
@@ -2080,7 +2080,7 @@ resource "azurerm_app_service_slot" "test" {
   auth_settings {
     enabled = true
     issuer  = "https://sts.windows.net/%s"
-          
+
     allowed_external_redirect_urls = [
       "https://terra.form"
     ]
@@ -2137,8 +2137,8 @@ resource "azurerm_app_service_slot" "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 {
@@ -2193,8 +2193,8 @@ resource "azurerm_app_service_slot" "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 {
@@ -2243,14 +2243,14 @@ resource "azurerm_app_service_slot" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   app_service_plan_id = "${azurerm_app_service_plan.test.id}"
   app_service_name    = "${azurerm_app_service.test.name}"
-  
+
   site_config {
     always_on = true
   }
 
   auth_settings {
-    enabled = true
-    issuer  = "https://sts.windows.net/%s"
+    enabled             = true
+    issuer              = "https://sts.windows.net/%s"
     token_store_enabled = true
 
     active_directory {
@@ -2305,8 +2305,8 @@ resource "azurerm_app_service_slot" "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 {
@@ -2576,8 +2576,8 @@ resource "azurerm_app_service_slot" "test" {
   auth_settings {
     enabled = true
     twitter {
-      consumer_key     = "twitterconsumerkey"
-      consumer_secret  = "twitterconsumersecret"
+      consumer_key    = "twitterconsumerkey"
+      consumer_secret = "twitterconsumersecret"
     }
   }
 }
@@ -2635,7 +2635,7 @@ resource "azurerm_app_service_slot" "test" {
         "activedirectorytokenaudiences",
       ]
     }
-    
+
     microsoft {
       client_id     = "microsoftclientid"
       client_secret = "microsoftclientsecret"
diff --git a/azurerm/resource_arm_app_service_test.go b/azurerm/resource_arm_app_service_test.go
index 16874bd2e642..b1e9f671ae4e 100644
--- a/azurerm/resource_arm_app_service_test.go
+++ b/azurerm/resource_arm_app_service_test.go
@@ -2542,7 +2542,7 @@ data "azurerm_storage_account_sas" "test" {
   start  = "2019-03-21"
   expiry = "2022-03-21"
 
-    permissions {
+  permissions {
     read    = false
     write   = true
     delete  = false
@@ -2964,9 +2964,9 @@ resource "azurerm_storage_account" "test" {
 }
 
 resource "azurerm_storage_container" "test" {
-  name                  = "acctestcontainer"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  storage_account_name  = "${azurerm_storage_account.test.name}"
+  name                 = "acctestcontainer"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  storage_account_name = "${azurerm_storage_account.test.name}"
 }
 
 resource "azurerm_app_service_plan" "test" {
@@ -3025,9 +3025,9 @@ resource "azurerm_storage_account" "test" {
 }
 
 resource "azurerm_storage_container" "test" {
-  name                  = "acctestcontainer"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  storage_account_name  = "${azurerm_storage_account.test.name}"
+  name                 = "acctestcontainer"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  storage_account_name = "${azurerm_storage_account.test.name}"
 }
 
 resource "azurerm_storage_share" "test" {
@@ -3376,7 +3376,7 @@ resource "azurerm_app_service" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   app_service_plan_id = "${azurerm_app_service_plan.test.id}"
   app_settings = {
-	  foo = "bar"
+    foo = "bar"
   }
   logs {
     application_logs {
diff --git a/azurerm/resource_arm_application_gateway_test.go b/azurerm/resource_arm_application_gateway_test.go
index 737fe17e0390..377e4dec1bba 100644
--- a/azurerm/resource_arm_application_gateway_test.go
+++ b/azurerm/resource_arm_application_gateway_test.go
@@ -1376,13 +1376,13 @@ 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 {
     min_capacity = %d
-	max_capacity = %d
+    max_capacity = %d
   }
 
   gateway_ip_configuration {
@@ -1832,7 +1832,7 @@ resource "azurerm_public_ip" "testStd" {
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
   allocation_method   = "Static"
-  sku                 = "Standard" 
+  sku                 = "Standard"
 }
 
 resource "azurerm_key_vault" "test" {
@@ -1844,7 +1844,7 @@ resource "azurerm_key_vault" "test" {
 
   access_policy {
     tenant_id               = "${data.azurerm_client_config.test.tenant_id}"
-    object_id               = "${data.azurerm_client_config.test.service_principal_object_id }"
+    object_id               = "${data.azurerm_client_config.test.service_principal_object_id}"
     secret_permissions      = ["delete", "get", "set"]
     certificate_permissions = ["create", "delete", "get", "import"]
   }
@@ -1970,7 +1970,7 @@ resource "azurerm_public_ip" "teststd" {
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
   allocation_method   = "Static"
-  sku                 = "Standard" 
+  sku                 = "Standard"
 }
 
 resource "azurerm_application_gateway" "test" {
@@ -2136,7 +2136,7 @@ resource "azurerm_public_ip" "teststd" {
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
   allocation_method   = "Static"
-  sku                 = "Standard" 
+  sku                 = "Standard"
 }
 
 
@@ -2842,12 +2842,12 @@ resource "azurerm_application_gateway" "test" {
   }
 
   backend_http_settings {
-    name                  = "${local.http_setting_name}"
-    cookie_based_affinity = "Disabled"
-    host_name             = "%s"
-    port                  = 80
-    protocol              = "Http"
-    request_timeout       = 1
+    name                                = "${local.http_setting_name}"
+    cookie_based_affinity               = "Disabled"
+    host_name                           = "%s"
+    port                                = 80
+    protocol                            = "Http"
+    request_timeout                     = 1
     pick_host_name_from_backend_address = %t
   }
 
diff --git a/azurerm/resource_arm_automation_account_test.go b/azurerm/resource_arm_automation_account_test.go
index 27401c590c64..4c0727a89cdc 100644
--- a/azurerm/resource_arm_automation_account_test.go
+++ b/azurerm/resource_arm_automation_account_test.go
@@ -232,7 +232,7 @@ resource "azurerm_automation_account" "test" {
 
   sku {
     name = "Basic"
-  } 
+  }
 }
 `, rInt, location, rInt)
 }
@@ -281,7 +281,7 @@ resource "azurerm_automation_account" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
 
   sku_name = "Basic"
-  
+
   tags = {
     "hello" = "world"
   }
diff --git a/azurerm/resource_arm_availability_set_test.go b/azurerm/resource_arm_availability_set_test.go
index 7ab894bbf22e..da4f36c8725d 100644
--- a/azurerm/resource_arm_availability_set_test.go
+++ b/azurerm/resource_arm_availability_set_test.go
@@ -382,7 +382,7 @@ resource "azurerm_availability_set" "test" {
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
 
-	proximity_placement_group_id = "${azurerm_proximity_placement_group.test.id}"
+  proximity_placement_group_id = "${azurerm_proximity_placement_group.test.id}"
 }
 `, rInt, location, rInt, rInt)
 }
diff --git a/azurerm/resource_arm_bastion_host_test.go b/azurerm/resource_arm_bastion_host_test.go
index 59c3dc28135d..22a989dd8e8d 100644
--- a/azurerm/resource_arm_bastion_host_test.go
+++ b/azurerm/resource_arm_bastion_host_test.go
@@ -187,9 +187,9 @@ func testAccAzureRMBastionHost_requiresImport(rInt int, rString string, location
 	return fmt.Sprintf(`
 %s
 resource "azurerm_bastion_host" "import" {
-  name                 = "${azurerm_bastion_host.test.name}"
-  resource_group_name  = "${azurerm_bastion_host.test.resource_group_name}"
-  location             = "${azurerm_bastion_host.test.location}"
+  name                = "${azurerm_bastion_host.test.name}"
+  resource_group_name = "${azurerm_bastion_host.test.resource_group_name}"
+  location            = "${azurerm_bastion_host.test.location}"
 
   ip_configuration {
     name                 = "configuration"
diff --git a/azurerm/resource_arm_batch_account_test.go b/azurerm/resource_arm_batch_account_test.go
index f9aef4e14735..91dd5a41e4bc 100644
--- a/azurerm/resource_arm_batch_account_test.go
+++ b/azurerm/resource_arm_batch_account_test.go
@@ -302,7 +302,7 @@ resource "azurerm_batch_account" "test" {
 func testAccAzureRMBatchAccount_userSubscription(rInt int, batchAccountSuffix string, location string, tenantID string) string {
 	return fmt.Sprintf(`
 data "azuread_service_principal" "test" {
-	display_name = "Microsoft Azure Batch"
+  display_name = "Microsoft Azure Batch"
 }
 
 resource "azurerm_resource_group" "test" {
@@ -326,24 +326,24 @@ resource "azurerm_key_vault" "test" {
   access_policy {
     tenant_id = "%s"
     object_id = "${data.azuread_service_principal.test.object_id}"
-   
+
     secret_permissions = [
-  	  "get",
-  	  "list",
-  	  "set",
-  	  "delete"
+      "get",
+      "list",
+      "set",
+      "delete"
     ]
-   
+
   }
 }
 
 resource "azurerm_batch_account" "test" {
-  name                 = "testaccbatch%s"
-  resource_group_name  = "${azurerm_resource_group.test.name}"
-  location             = "${azurerm_resource_group.test.location}"
-  
+  name                = "testaccbatch%s"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  location            = "${azurerm_resource_group.test.location}"
+
   pool_allocation_mode = "UserSubscription"
-  
+
   key_vault_reference {
     id  = "${azurerm_key_vault.test.id}"
     url = "${azurerm_key_vault.test.vault_uri}"
diff --git a/azurerm/resource_arm_batch_application_test.go b/azurerm/resource_arm_batch_application_test.go
index 98a8717c2b49..8b44da19ef52 100644
--- a/azurerm/resource_arm_batch_application_test.go
+++ b/azurerm/resource_arm_batch_application_test.go
@@ -143,8 +143,8 @@ resource "azurerm_batch_account" "test" {
 resource "azurerm_batch_application" "test" {
   name                = "acctestbatchapp-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
-	account_name        = "${azurerm_batch_account.test.name}"
-	%s
+  account_name        = "${azurerm_batch_account.test.name}"
+  	%s
 }
 `, rInt, location, rString, rString, rInt, displayName)
 }
diff --git a/azurerm/resource_arm_batch_pool_test.go b/azurerm/resource_arm_batch_pool_test.go
index 887f4e1ac160..e8f80ba978ce 100644
--- a/azurerm/resource_arm_batch_pool_test.go
+++ b/azurerm/resource_arm_batch_pool_test.go
@@ -930,7 +930,7 @@ resource "azurerm_batch_certificate" "testcer" {
   account_name         = "${azurerm_batch_account.test.name}"
   certificate          = "${filebase64("testdata/batch_certificate.cer")}"
   format               = "Cer"
-  thumbprint           = "312d31a79fa0cef49c00f769afc2b73e9f4edf34"        # deliberately using lowercase here as verification
+  thumbprint           = "312d31a79fa0cef49c00f769afc2b73e9f4edf34" # deliberately using lowercase here as verification
   thumbprint_algorithm = "SHA1"
 }
 
@@ -1017,7 +1017,7 @@ resource "azurerm_batch_pool" "test" {
 
   container_configuration {
     type = "DockerCompatible"
-    container_registries= [
+    container_registries = [
       {
         registry_server = "myContainerRegistry.azurecr.io"
         user_name       = "myUserName"
@@ -1166,11 +1166,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 {
     id = "${azurerm_image.test.id}"
   }
diff --git a/azurerm/resource_arm_bot_connection_test.go b/azurerm/resource_arm_bot_connection_test.go
index 683cdf64c479..99e172a4a052 100644
--- a/azurerm/resource_arm_bot_connection_test.go
+++ b/azurerm/resource_arm_bot_connection_test.go
@@ -174,7 +174,7 @@ resource "azurerm_bot_connection" "test" {
   client_id             = "test"
   client_secret         = "secret"
   scopes                = "testscope"
-  
+
   parameters = {
     loginUri = "www.example.com"
   }
@@ -196,7 +196,7 @@ resource "azurerm_bot_connection" "test" {
   client_id             = "test2"
   client_secret         = "secret2"
   scopes                = "testscope2"
-  
+
   parameters = {
     loginUri = "www.example2.com"
   }
diff --git a/azurerm/resource_arm_container_group_test.go b/azurerm/resource_arm_container_group_test.go
index b163f1a74cf6..d271f2ab3a82 100644
--- a/azurerm/resource_arm_container_group_test.go
+++ b/azurerm/resource_arm_container_group_test.go
@@ -917,7 +917,7 @@ resource "azurerm_container_group" "test" {
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
   ip_address_type     = "Private"
-  network_profile_id	=	"${azurerm_network_profile.test.id}"
+  network_profile_id  = "${azurerm_network_profile.test.id}"
   os_type             = "Linux"
 
   container {
diff --git a/azurerm/resource_arm_container_registry_test.go b/azurerm/resource_arm_container_registry_test.go
index ed60442cbc76..e6b23dfd42c5 100644
--- a/azurerm/resource_arm_container_registry_test.go
+++ b/azurerm/resource_arm_container_registry_test.go
@@ -672,7 +672,7 @@ resource "azurerm_container_registry" "test" {
   network_rule_set {
     default_action = "Allow"
 
-	ip_rule {
+    ip_rule {
       action   = "Allow"
       ip_range = "8.8.8.8/32"
     }
@@ -714,7 +714,7 @@ resource "azurerm_container_registry" "test" {
   network_rule_set {
     default_action = "Deny"
 
-	virtual_network {
+    virtual_network {
       action    = "Allow"
       subnet_id = "${azurerm_subnet.test.id}"
     }
diff --git a/azurerm/resource_arm_container_registry_webhook_test.go b/azurerm/resource_arm_container_registry_webhook_test.go
index 2c902a487ce0..0cb22467abb6 100644
--- a/azurerm/resource_arm_container_registry_webhook_test.go
+++ b/azurerm/resource_arm_container_registry_webhook_test.go
@@ -224,10 +224,10 @@ resource "azurerm_resource_group" "rg" {
 }
 
 resource "azurerm_container_registry" "acr" {
-  name                     = "acrwebhooktest%d"
-  resource_group_name      = azurerm_resource_group.rg.name
-  location                 = "%s"
-  sku                      = "Standard"
+  name                = "acrwebhooktest%d"
+  resource_group_name = azurerm_resource_group.rg.name
+  location            = "%s"
+  sku                 = "Standard"
 }
 
 resource "azurerm_container_registry_webhook" "test" {
@@ -235,11 +235,11 @@ resource "azurerm_container_registry_webhook" "test" {
   resource_group_name = azurerm_resource_group.rg.name
   registry_name       = azurerm_container_registry.acr.name
   location            = "%s"
-  
-  service_uri    = "https://mywebhookreceiver.example/mytag"
+
+  service_uri = "https://mywebhookreceiver.example/mytag"
 
   actions = [
-      "push"
+    "push"
   ]
 }
 `, rInt, location, rInt, location, rInt, location)
@@ -253,10 +253,10 @@ resource "azurerm_resource_group" "rg" {
 }
 
 resource "azurerm_container_registry" "acr" {
-  name                     = "acrwebhooktest%d"
-  resource_group_name      = azurerm_resource_group.rg.name
-  location                 = "%s"
-  sku                      = "Standard"
+  name                = "acrwebhooktest%d"
+  resource_group_name = azurerm_resource_group.rg.name
+  location            = "%s"
+  sku                 = "Standard"
 }
 
 resource "azurerm_container_registry_webhook" "test" {
@@ -264,15 +264,15 @@ resource "azurerm_container_registry_webhook" "test" {
   resource_group_name = azurerm_resource_group.rg.name
   registry_name       = azurerm_container_registry.acr.name
   location            = "%s"
-  
-  service_uri    = "https://mywebhookreceiver.example/mytag"
+
+  service_uri = "https://mywebhookreceiver.example/mytag"
 
   actions = [
-      "push"
+    "push"
   ]
 
   tags = {
-	label = "test"
+    label = "test"
   }
 }
 `, rInt, location, rInt, location, rInt, location)
@@ -286,10 +286,10 @@ resource "azurerm_resource_group" "rg" {
 }
 
 resource "azurerm_container_registry" "acr" {
-  name                     = "acrwebhooktest%d"
-  resource_group_name      = azurerm_resource_group.rg.name
-  location                 = "%s"
-  sku                      = "Standard"
+  name                = "acrwebhooktest%d"
+  resource_group_name = azurerm_resource_group.rg.name
+  location            = "%s"
+  sku                 = "Standard"
 }
 
 resource "azurerm_container_registry_webhook" "test" {
@@ -297,16 +297,16 @@ resource "azurerm_container_registry_webhook" "test" {
   resource_group_name = azurerm_resource_group.rg.name
   registry_name       = azurerm_container_registry.acr.name
   location            = "%s"
-  
-  service_uri    = "https://mywebhookreceiver.example/mytag"
+
+  service_uri = "https://mywebhookreceiver.example/mytag"
 
   actions = [
-      "push"
+    "push"
   ]
 
   tags = {
-	label = "test1"
-	ENV   = "prod"
+    label = "test1"
+    ENV   = "prod"
   }
 }
 `, rInt, location, rInt, location, rInt, location)
@@ -320,10 +320,10 @@ resource "azurerm_resource_group" "rg" {
 }
 
 resource "azurerm_container_registry" "acr" {
-  name                     = "acrwebhooktest%d"
-  resource_group_name      = azurerm_resource_group.rg.name
-  location                 = "%s"
-  sku                      = "Standard"
+  name                = "acrwebhooktest%d"
+  resource_group_name = azurerm_resource_group.rg.name
+  location            = "%s"
+  sku                 = "Standard"
 }
 
 resource "azurerm_container_registry_webhook" "test" {
@@ -331,11 +331,11 @@ resource "azurerm_container_registry_webhook" "test" {
   resource_group_name = azurerm_resource_group.rg.name
   registry_name       = azurerm_container_registry.acr.name
   location            = "%s"
-  
-  service_uri    = "https://mywebhookreceiver.example/mytag"
+
+  service_uri = "https://mywebhookreceiver.example/mytag"
 
   actions = [
-      "push"
+    "push"
   ]
 }
 `, rInt, location, rInt, location, rInt, location)
@@ -349,10 +349,10 @@ resource "azurerm_resource_group" "rg" {
 }
 
 resource "azurerm_container_registry" "acr" {
-  name                     = "acrwebhooktest%d"
-  resource_group_name      = azurerm_resource_group.rg.name
-  location                 = "%s"
-  sku                      = "Standard"
+  name                = "acrwebhooktest%d"
+  resource_group_name = azurerm_resource_group.rg.name
+  location            = "%s"
+  sku                 = "Standard"
 }
 
 resource "azurerm_container_registry_webhook" "test" {
@@ -360,12 +360,12 @@ resource "azurerm_container_registry_webhook" "test" {
   resource_group_name = azurerm_resource_group.rg.name
   registry_name       = azurerm_container_registry.acr.name
   location            = "%s"
-  
-  service_uri    = "https://mywebhookreceiver.example/mytag"
+
+  service_uri = "https://mywebhookreceiver.example/mytag"
 
   actions = [
-      "push",
-      "delete"
+    "push",
+    "delete"
   ]
 }
 `, rInt, location, rInt, location, rInt, location)
@@ -379,10 +379,10 @@ resource "azurerm_resource_group" "rg" {
 }
 
 resource "azurerm_container_registry" "acr" {
-  name                     = "acrwebhooktest%d"
-  resource_group_name      = azurerm_resource_group.rg.name
-  location                 = "%s"
-  sku                      = "Standard"
+  name                = "acrwebhooktest%d"
+  resource_group_name = azurerm_resource_group.rg.name
+  location            = "%s"
+  sku                 = "Standard"
 }
 
 resource "azurerm_container_registry_webhook" "test" {
@@ -390,13 +390,13 @@ resource "azurerm_container_registry_webhook" "test" {
   resource_group_name = azurerm_resource_group.rg.name
   registry_name       = azurerm_container_registry.acr.name
   location            = "%s"
-  
-  service_uri    = "https://mywebhookreceiver.example/mytag"
+
+  service_uri = "https://mywebhookreceiver.example/mytag"
 
   status = "enabled"
 
   actions = [
-      "push"
+    "push"
   ]
 }
 `, rInt, location, rInt, location, rInt, location)
@@ -410,10 +410,10 @@ resource "azurerm_resource_group" "rg" {
 }
 
 resource "azurerm_container_registry" "acr" {
-  name                     = "acrwebhooktest%d"
-  resource_group_name      = azurerm_resource_group.rg.name
-  location                 = "%s"
-  sku                      = "Standard"
+  name                = "acrwebhooktest%d"
+  resource_group_name = azurerm_resource_group.rg.name
+  location            = "%s"
+  sku                 = "Standard"
 }
 
 resource "azurerm_container_registry_webhook" "test" {
@@ -421,13 +421,13 @@ resource "azurerm_container_registry_webhook" "test" {
   resource_group_name = azurerm_resource_group.rg.name
   registry_name       = azurerm_container_registry.acr.name
   location            = "%s"
-  
-  service_uri    = "https://mywebhookreceiver.example/mytag"
+
+  service_uri = "https://mywebhookreceiver.example/mytag"
 
   status = "disabled"
 
   actions = [
-      "push"
+    "push"
   ]
 }
 `, rInt, location, rInt, location, rInt, location)
@@ -441,10 +441,10 @@ resource "azurerm_resource_group" "rg" {
 }
 
 resource "azurerm_container_registry" "acr" {
-  name                     = "acrwebhooktest%d"
-  resource_group_name      = azurerm_resource_group.rg.name
-  location                 = "%s"
-  sku                      = "Standard"
+  name                = "acrwebhooktest%d"
+  resource_group_name = azurerm_resource_group.rg.name
+  location            = "%s"
+  sku                 = "Standard"
 }
 
 resource "azurerm_container_registry_webhook" "test" {
@@ -452,11 +452,11 @@ resource "azurerm_container_registry_webhook" "test" {
   resource_group_name = azurerm_resource_group.rg.name
   registry_name       = azurerm_container_registry.acr.name
   location            = "%s"
-  
-  service_uri    = "https://mywebhookreceiver.example/mytag"
+
+  service_uri = "https://mywebhookreceiver.example/mytag"
 
   actions = [
-      "push"
+    "push"
   ]
 }
 `, rInt, location, rInt, location, rInt, location)
@@ -470,10 +470,10 @@ resource "azurerm_resource_group" "rg" {
 }
 
 resource "azurerm_container_registry" "acr" {
-  name                     = "acrwebhooktest%d"
-  resource_group_name      = azurerm_resource_group.rg.name
-  location                 = "%s"
-  sku                      = "Standard"
+  name                = "acrwebhooktest%d"
+  resource_group_name = azurerm_resource_group.rg.name
+  location            = "%s"
+  sku                 = "Standard"
 }
 
 resource "azurerm_container_registry_webhook" "test" {
@@ -481,13 +481,13 @@ resource "azurerm_container_registry_webhook" "test" {
   resource_group_name = azurerm_resource_group.rg.name
   registry_name       = azurerm_container_registry.acr.name
   location            = "%s"
-  
-  service_uri    = "https://my.webhookreceiver.example/mytag/2"
+
+  service_uri = "https://my.webhookreceiver.example/mytag/2"
 
   status = "disabled"
 
   actions = [
-      "push"
+    "push"
   ]
 }
 `, rInt, location, rInt, location, rInt, location)
@@ -501,10 +501,10 @@ resource "azurerm_resource_group" "rg" {
 }
 
 resource "azurerm_container_registry" "acr" {
-  name                     = "acrwebhooktest%d"
-  resource_group_name      = azurerm_resource_group.rg.name
-  location                 = "%s"
-  sku                      = "Standard"
+  name                = "acrwebhooktest%d"
+  resource_group_name = azurerm_resource_group.rg.name
+  location            = "%s"
+  sku                 = "Standard"
 }
 
 resource "azurerm_container_registry_webhook" "test" {
@@ -512,13 +512,13 @@ resource "azurerm_container_registry_webhook" "test" {
   resource_group_name = azurerm_resource_group.rg.name
   registry_name       = azurerm_container_registry.acr.name
   location            = "%s"
-  
-  service_uri    = "https://mywebhookreceiver.example/mytag"
+
+  service_uri = "https://mywebhookreceiver.example/mytag"
 
   scope = "mytag:*"
 
   actions = [
-      "push"
+    "push"
   ]
 }
 `, rInt, location, rInt, location, rInt, location)
@@ -532,10 +532,10 @@ resource "azurerm_resource_group" "rg" {
 }
 
 resource "azurerm_container_registry" "acr" {
-  name                     = "acrwebhooktest%d"
-  resource_group_name      = azurerm_resource_group.rg.name
-  location                 = "%s"
-  sku                      = "Standard"
+  name                = "acrwebhooktest%d"
+  resource_group_name = azurerm_resource_group.rg.name
+  location            = "%s"
+  sku                 = "Standard"
 }
 
 resource "azurerm_container_registry_webhook" "test" {
@@ -543,13 +543,13 @@ resource "azurerm_container_registry_webhook" "test" {
   resource_group_name = azurerm_resource_group.rg.name
   registry_name       = azurerm_container_registry.acr.name
   location            = "%s"
-  
-  service_uri    = "https://mywebhookreceiver.example/mytag"
+
+  service_uri = "https://mywebhookreceiver.example/mytag"
 
   scope = "mytag:4"
 
   actions = [
-      "push"
+    "push"
   ]
 }
 `, rInt, location, rInt, location, rInt, location)
@@ -563,10 +563,10 @@ resource "azurerm_resource_group" "rg" {
 }
 
 resource "azurerm_container_registry" "acr" {
-  name                     = "acrwebhooktest%d"
-  resource_group_name      = azurerm_resource_group.rg.name
-  location                 = "%s"
-  sku                      = "Standard"
+  name                = "acrwebhooktest%d"
+  resource_group_name = azurerm_resource_group.rg.name
+  location            = "%s"
+  sku                 = "Standard"
 }
 
 resource "azurerm_container_registry_webhook" "test" {
@@ -574,15 +574,15 @@ resource "azurerm_container_registry_webhook" "test" {
   resource_group_name = azurerm_resource_group.rg.name
   registry_name       = azurerm_container_registry.acr.name
   location            = "%s"
-  
-  service_uri    = "https://mywebhookreceiver.example/mytag"
+
+  service_uri = "https://mywebhookreceiver.example/mytag"
 
   custom_headers = {
     "Content-Type" = "application/json"
   }
 
   actions = [
-      "push"
+    "push"
   ]
 }
 `, rInt, location, rInt, location, rInt, location)
@@ -596,10 +596,10 @@ resource "azurerm_resource_group" "rg" {
 }
 
 resource "azurerm_container_registry" "acr" {
-  name                     = "acrwebhooktest%d"
-  resource_group_name      = azurerm_resource_group.rg.name
-  location                 = "%s"
-  sku                      = "Standard"
+  name                = "acrwebhooktest%d"
+  resource_group_name = azurerm_resource_group.rg.name
+  location            = "%s"
+  sku                 = "Standard"
 }
 
 resource "azurerm_container_registry_webhook" "test" {
@@ -607,16 +607,16 @@ resource "azurerm_container_registry_webhook" "test" {
   resource_group_name = azurerm_resource_group.rg.name
   registry_name       = azurerm_container_registry.acr.name
   location            = "%s"
-  
-  service_uri    = "https://mywebhookreceiver.example/mytag"
+
+  service_uri = "https://mywebhookreceiver.example/mytag"
 
   custom_headers = {
-    "Content-Type"  = "application/xml"
-    "Accept-Charset" = "utf-8" 
+    "Content-Type"   = "application/xml"
+    "Accept-Charset" = "utf-8"
   }
 
   actions = [
-      "push"
+    "push"
   ]
 }
 `, rInt, location, rInt, location, rInt, location)
diff --git a/azurerm/resource_arm_cosmosdb_sql_container_test.go b/azurerm/resource_arm_cosmosdb_sql_container_test.go
index 2e7fef29307a..4dfb278f64c7 100644
--- a/azurerm/resource_arm_cosmosdb_sql_container_test.go
+++ b/azurerm/resource_arm_cosmosdb_sql_container_test.go
@@ -177,7 +177,7 @@ resource "azurerm_cosmosdb_sql_container" "test" {
   database_name       = "${azurerm_cosmosdb_sql_database.test.name}"
   partition_key_path  = "/definition/id"
   unique_key {
-	paths = ["/definition/id1", "/definition/id2"]
+    paths = ["/definition/id1", "/definition/id2"]
   }
 }
 
diff --git a/azurerm/resource_arm_dashboard_test.go b/azurerm/resource_arm_dashboard_test.go
index 3496aec22b85..7a3add38e730 100644
--- a/azurerm/resource_arm_dashboard_test.go
+++ b/azurerm/resource_arm_dashboard_test.go
@@ -93,16 +93,16 @@ func testCheckAzureRMDashboardDestroy(s *terraform.State) error {
 
 func testResourceArmDashboard_basic(rInt int, location string) string {
 	return fmt.Sprintf(`
-    resource "azurerm_resource_group" "test-group"{
-        name = "acctestRG-%d"
-        location = "%s"
-    }
-
-    resource "azurerm_dashboard" "test" {
-        name                       = "my-test-dashboard"
-        resource_group_name        = azurerm_resource_group.test-group.name
-        location                   = azurerm_resource_group.test-group.location
-        dashboard_properties       = <<DASH
+resource "azurerm_resource_group" "test-group" {
+  name     = "acctestRG-%d"
+  location = "%s"
+}
+
+resource "azurerm_dashboard" "test" {
+  name                 = "my-test-dashboard"
+  resource_group_name  = azurerm_resource_group.test-group.name
+  location             = azurerm_resource_group.test-group.location
+  dashboard_properties = <<DASH
 {
    "lenses": {
         "0": {
@@ -134,6 +134,6 @@ func testResourceArmDashboard_basic(rInt int, location string) string {
 	}
 }
 DASH
-	}
+}
 `, rInt, location)
 }
diff --git a/azurerm/resource_arm_data_factory_integration_runtime_managed_test.go b/azurerm/resource_arm_data_factory_integration_runtime_managed_test.go
index 4211dffaa8cf..49dd162867bb 100644
--- a/azurerm/resource_arm_data_factory_integration_runtime_managed_test.go
+++ b/azurerm/resource_arm_data_factory_integration_runtime_managed_test.go
@@ -257,7 +257,7 @@ resource "azurerm_storage_account" "test" {
   account_kind              = "BlobStorage"
   account_tier              = "Standard"
   account_replication_type  = "LRS"
-  access_tier			    = "Hot"
+  access_tier               = "Hot"
   enable_https_traffic_only = true
 }
 
@@ -294,7 +294,7 @@ resource "azurerm_data_factory_integration_runtime_managed" "test" {
   node_size = "Standard_D8_v3"
 
   custom_setup_script {
-	blob_container_uri = "${azurerm_storage_account.test.primary_blob_endpoint}/${azurerm_storage_container.test.name}"
+    blob_container_uri = "${azurerm_storage_account.test.primary_blob_endpoint}/${azurerm_storage_container.test.name}"
     sas_token          = "${data.azurerm_storage_account_blob_container_sas.test.sas}"
   }
 }
diff --git a/azurerm/resource_arm_dev_test_lab_schedule_test.go b/azurerm/resource_arm_dev_test_lab_schedule_test.go
index 396afcbc5486..de775e002f09 100644
--- a/azurerm/resource_arm_dev_test_lab_schedule_test.go
+++ b/azurerm/resource_arm_dev_test_lab_schedule_test.go
@@ -175,36 +175,36 @@ func testCheckAzureRMDevTestLabScheduleDestroy(s *terraform.State) error {
 
 func testAccAzureRMDevTestLabSchedule_autoShutdownBasic(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_dev_test_lab" "test" {
+  name                = "acctdtl-%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+
+}
+
+resource "azurerm_dev_test_schedule" "test" {
+  name                = "LabVmsShutdown"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  lab_name            = "${azurerm_dev_test_lab.test.name}"
+  daily_recurrence {
+    time = "0100"
   }
-  
-  resource "azurerm_dev_test_lab" "test" {
-    name                = "acctdtl-%d"
-    location            = "${azurerm_resource_group.test.location}"
-    resource_group_name = "${azurerm_resource_group.test.name}"
-    
+  time_zone_id = "India Standard Time"
+  task_type    = "LabVmsShutdownTask"
+  notification_settings {
+
   }
-  
-  resource "azurerm_dev_test_schedule" "test" {
-    name = "LabVmsShutdown"
-    location            = "${azurerm_resource_group.test.location}"
-    resource_group_name = "${azurerm_resource_group.test.name}"
-    lab_name = "${azurerm_dev_test_lab.test.name}"
-    daily_recurrence  {
-        time = "0100"
-    }
-    time_zone_id = "India Standard Time"
-    task_type = "LabVmsShutdownTask"
-    notification_settings {
-
-    }
-
-    tags = {
-      environment = "Production"
-    }
+
+  tags = {
+    environment = "Production"
   }
+}
 `, rInt, location, rInt)
 }
 
@@ -219,26 +219,26 @@ resource "azurerm_dev_test_lab" "test" {
   name                = "acctdtl-%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  
+
 }
 
 resource "azurerm_dev_test_schedule" "test" {
-  name = "LabVmsShutdown"
-  status = "Enabled"
+  name                = "LabVmsShutdown"
+  status              = "Enabled"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  lab_name = "${azurerm_dev_test_lab.test.name}"
-  daily_recurrence  {
-      time = "0900"
+  lab_name            = "${azurerm_dev_test_lab.test.name}"
+  daily_recurrence {
+    time = "0900"
   }
   time_zone_id = "India Standard Time"
-  task_type = "LabVmsShutdownTask"
+  task_type    = "LabVmsShutdownTask"
   notification_settings {
     time_in_minutes = 30
-    webhook_url = "https://www.bing.com/2/4"
-    status = "Enabled"
+    webhook_url     = "https://www.bing.com/2/4"
+    status          = "Enabled"
   }
-tags = {
+  tags = {
     environment = "Production"
   }
 }
@@ -248,39 +248,39 @@ tags = {
 
 func testAccAzureRMDevTestLabSchedule_autoStartupBasic(rInt int, location string) string {
 	return fmt.Sprintf(`
-  resource "azurerm_resource_group" "test" {
-    name     = "acctestrg-%d"
-    location = "%s"
-  }
-  
-  resource "azurerm_dev_test_lab" "test" {
-    name                = "acctdtl-%d"
-    location            = "${azurerm_resource_group.test.location}"
-    resource_group_name = "${azurerm_resource_group.test.name}"
-    
+resource "azurerm_resource_group" "test" {
+  name     = "acctestrg-%d"
+  location = "%s"
+}
+
+resource "azurerm_dev_test_lab" "test" {
+  name                = "acctdtl-%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+
+}
+
+resource "azurerm_dev_test_schedule" "test" {
+  name                = "LabVmAutoStart"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  lab_name            = "${azurerm_dev_test_lab.test.name}"
+  weekly_recurrence {
+    time      = "1100"
+    week_days = ["Monday", "Tuesday"]
   }
-  
-  resource "azurerm_dev_test_schedule" "test" {
-    name = "LabVmAutoStart"
-    location            = "${azurerm_resource_group.test.location}"
-    resource_group_name = "${azurerm_resource_group.test.name}"
-    lab_name = "${azurerm_dev_test_lab.test.name}"
-		weekly_recurrence {
-			time = "1100"
-			week_days = ["Monday", "Tuesday"]
-		}
 
-    time_zone_id = "India Standard Time"
-    task_type = "LabVmsStartupTask"
-		
-		notification_settings {
+  time_zone_id = "India Standard Time"
+  task_type    = "LabVmsStartupTask"
+
+  notification_settings {
 
-    }
+  }
 
-    tags = {
-      environment = "Production"
-    }
+  tags = {
+    environment = "Production"
   }
+}
 `, rInt, location, rInt)
 }
 
@@ -295,31 +295,31 @@ resource "azurerm_dev_test_lab" "test" {
   name                = "acctdtl-%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  
+
 }
 
 resource "azurerm_dev_test_schedule" "test" {
-  name = "LabVmAutoStart"
-    location            = "${azurerm_resource_group.test.location}"
-    resource_group_name = "${azurerm_resource_group.test.name}"
-	lab_name = "${azurerm_dev_test_lab.test.name}"
-		weekly_recurrence {
-			time = "1000"
-			week_days = ["Wednesday", "Thursday", "Friday"]
-		}
+  name                = "LabVmAutoStart"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  lab_name            = "${azurerm_dev_test_lab.test.name}"
+  weekly_recurrence {
+    time      = "1000"
+    week_days = ["Wednesday", "Thursday", "Friday"]
+  }
 
-    time_zone_id = "India Standard Time"
-		task_type = "LabVmsStartupTask"
-		
-    notification_settings {
- 
-		}
+  time_zone_id = "India Standard Time"
+  task_type    = "LabVmsStartupTask"
+
+  notification_settings {
+
+  }
 
-		status = "Enabled"
-		
-    tags = {
-      environment = "Production"
-    }
+  status = "Enabled"
+
+  tags = {
+    environment = "Production"
+  }
 }
 
 `, rInt, location, rInt)
@@ -327,57 +327,57 @@ resource "azurerm_dev_test_schedule" "test" {
 
 func testAccAzureRMDevTestLabSchedule_concurrent(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_dev_test_lab" "test" {
+  name                = "acctdtl-%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+
+}
+
+resource "azurerm_dev_test_schedule" "test" {
+  name                = "LabVmAutoStart"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  lab_name            = "${azurerm_dev_test_lab.test.name}"
+  weekly_recurrence {
+    time      = "1100"
+    week_days = ["Monday", "Tuesday"]
   }
-  
-  resource "azurerm_dev_test_lab" "test" {
-    name                = "acctdtl-%d"
-    location            = "${azurerm_resource_group.test.location}"
-    resource_group_name = "${azurerm_resource_group.test.name}"
-    
+
+  time_zone_id = "India Standard Time"
+  task_type    = "LabVmsStartupTask"
+
+  notification_settings {
+
   }
-  
-  resource "azurerm_dev_test_schedule" "test" {
-    name = "LabVmAutoStart"
-    location            = "${azurerm_resource_group.test.location}"
-    resource_group_name = "${azurerm_resource_group.test.name}"
-    lab_name = "${azurerm_dev_test_lab.test.name}"
-		weekly_recurrence {
-			time = "1100"
-			week_days = ["Monday", "Tuesday"]
-		}
 
-    time_zone_id = "India Standard Time"
-    task_type = "LabVmsStartupTask"
-		
-		notification_settings {
+  tags = {
+    environment = "Production"
+  }
+}
 
-    }
+resource "azurerm_dev_test_schedule" "test2" {
+  name                = "LabVmsShutdown"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  lab_name            = "${azurerm_dev_test_lab.test.name}"
+  daily_recurrence {
+    time = "0100"
+  }
+  time_zone_id = "India Standard Time"
+  task_type    = "LabVmsShutdownTask"
+  notification_settings {
 
-    tags = {
-      environment = "Production"
-    }
-	}
-	
-	resource "azurerm_dev_test_schedule" "test2" {
-    name = "LabVmsShutdown"
-    location            = "${azurerm_resource_group.test.location}"
-    resource_group_name = "${azurerm_resource_group.test.name}"
-    lab_name = "${azurerm_dev_test_lab.test.name}"
-    daily_recurrence  {
-        time = "0100"
-    }
-    time_zone_id = "India Standard Time"
-    task_type = "LabVmsShutdownTask"
-    notification_settings {
-
-    }
-
-    tags = {
-      environment = "Production"
-    }
   }
+
+  tags = {
+    environment = "Production"
+  }
+}
 `, rInt, location, rInt)
 }
diff --git a/azurerm/resource_arm_eventhub_namespace_disaster_recovery_config_test.go b/azurerm/resource_arm_eventhub_namespace_disaster_recovery_config_test.go
index 2ebf6fa49264..27f00068b64f 100644
--- a/azurerm/resource_arm_eventhub_namespace_disaster_recovery_config_test.go
+++ b/azurerm/resource_arm_eventhub_namespace_disaster_recovery_config_test.go
@@ -169,10 +169,10 @@ resource "azurerm_eventhub_namespace" "testb" {
 }
 
 resource "azurerm_eventhub_namespace_disaster_recovery_config" "test" {
-  name                   = "acctest-EHN-DRC-%[1]d"
-  resource_group_name    = "${azurerm_resource_group.test.name}"
-  namespace_name         = "${azurerm_eventhub_namespace.testa.name}"
-  partner_namespace_id   = "${azurerm_eventhub_namespace.testb.id}"
+  name                 = "acctest-EHN-DRC-%[1]d"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  namespace_name       = "${azurerm_eventhub_namespace.testa.name}"
+  partner_namespace_id = "${azurerm_eventhub_namespace.testb.id}"
 }
 
 `, rInt, location, altlocation)
@@ -200,11 +200,11 @@ resource "azurerm_eventhub_namespace" "testb" {
 }
 
 resource "azurerm_eventhub_namespace_disaster_recovery_config" "test" {
-  name                   = "${azurerm_eventhub_namespace.testa.name}"
-  resource_group_name    = "${azurerm_resource_group.test.name}"
-  namespace_name         = "${azurerm_eventhub_namespace.testa.name}"
-  partner_namespace_id   = "${azurerm_eventhub_namespace.testb.id}"
-  alternate_name         = "acctest-EHN-DRC-%[1]d-alt"
+  name                 = "${azurerm_eventhub_namespace.testa.name}"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  namespace_name       = "${azurerm_eventhub_namespace.testa.name}"
+  partner_namespace_id = "${azurerm_eventhub_namespace.testb.id}"
+  alternate_name       = "acctest-EHN-DRC-%[1]d-alt"
 }
 
 `, rInt, location, altlocation)
@@ -239,10 +239,10 @@ resource "azurerm_eventhub_namespace" "testc" {
 }
 
 resource "azurerm_eventhub_namespace_disaster_recovery_config" "test" {
-  name                   = "acctest-EHN-DRC-%[1]d"
-  resource_group_name    = "${azurerm_resource_group.test.name}"
-  namespace_name         = "${azurerm_eventhub_namespace.testa.name}"
-  partner_namespace_id   = "${azurerm_eventhub_namespace.testc.id}"
+  name                 = "acctest-EHN-DRC-%[1]d"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  namespace_name       = "${azurerm_eventhub_namespace.testa.name}"
+  partner_namespace_id = "${azurerm_eventhub_namespace.testc.id}"
 }
 
 `, rInt, location, altlocation)
diff --git a/azurerm/resource_arm_firewall_test.go b/azurerm/resource_arm_firewall_test.go
index 47976a6396cb..242c530d31fa 100644
--- a/azurerm/resource_arm_firewall_test.go
+++ b/azurerm/resource_arm_firewall_test.go
@@ -557,7 +557,7 @@ resource "azurerm_firewall" "test" {
     public_ip_address_id = "${azurerm_public_ip.test.id}"
   }
 
-	zones = [%s]
+  zones = [%s]
 }
 `, rInt, location, rInt, rInt, rInt, zoneString)
 }
diff --git a/azurerm/resource_arm_front_door_firewall_policy_test.go b/azurerm/resource_arm_front_door_firewall_policy_test.go
index ebe0d8d59b3c..3b91974268e4 100644
--- a/azurerm/resource_arm_front_door_firewall_policy_test.go
+++ b/azurerm/resource_arm_front_door_firewall_policy_test.go
@@ -217,8 +217,8 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_frontdoor_firewall_policy" "test" {
-  name                              = "testAccFrontDoorWAF%[1]d"
-  resource_group_name               = azurerm_resource_group.test.name
+  name                = "testAccFrontDoorWAF%[1]d"
+  resource_group_name = azurerm_resource_group.test.name
 }
 `, rInt, location)
 }
diff --git a/azurerm/resource_arm_front_door_test.go b/azurerm/resource_arm_front_door_test.go
index db8bbf00ba0b..62e1e913efc6 100644
--- a/azurerm/resource_arm_front_door_test.go
+++ b/azurerm/resource_arm_front_door_test.go
@@ -233,14 +233,14 @@ resource "azurerm_frontdoor" "test" {
   enforce_backend_pools_certificate_name_check = false
 
   routing_rule {
-      name                    = "routing-rule"
-      accepted_protocols      = ["Http", "Https"]
-      patterns_to_match       = ["/*"]
-      frontend_endpoints      = [ local.endpoint_name ]
-      forwarding_configuration {
-          forwarding_protocol = "MatchRequest"
-          backend_pool_name   = local.backend_name
-      }
+    name               = "routing-rule"
+    accepted_protocols = ["Http", "Https"]
+    patterns_to_match  = ["/*"]
+    frontend_endpoints = [local.endpoint_name]
+    forwarding_configuration {
+      forwarding_protocol = "MatchRequest"
+      backend_pool_name   = local.backend_name
+    }
   }
 
   backend_pool_load_balancing {
@@ -252,16 +252,16 @@ resource "azurerm_frontdoor" "test" {
   }
 
   backend_pool {
-      name            = local.backend_name
-      backend {
-          host_header = "www.bing.com"
-          address     = "www.bing.com"
-          http_port   = 80
-          https_port  = 443
-      }
-
-      load_balancing_name = local.load_balancing_name
-      health_probe_name   = local.health_probe_name
+    name = local.backend_name
+    backend {
+      host_header = "www.bing.com"
+      address     = "www.bing.com"
+      http_port   = 80
+      https_port  = 443
+    }
+
+    load_balancing_name = local.load_balancing_name
+    health_probe_name   = local.health_probe_name
   }
 
   frontend_endpoint {
diff --git a/azurerm/resource_arm_healthcare_service_test.go b/azurerm/resource_arm_healthcare_service_test.go
index 83c4acd46801..676eebe8e9e3 100644
--- a/azurerm/resource_arm_healthcare_service_test.go
+++ b/azurerm/resource_arm_healthcare_service_test.go
@@ -109,21 +109,21 @@ resource "azurerm_healthcare_service" "test" {
   }
 
   access_policy_object_ids = [
-     "${data.azurerm_client_config.current.service_principal_object_id}",
+    "${data.azurerm_client_config.current.service_principal_object_id}",
   ]
 
   authentication_configuration {
-    authority = "https://login.microsoftonline.com/${data.azurerm_client_config.current.tenant_id}"
-    audience  = "https://azurehealthcareapis.com"
+    authority           = "https://login.microsoftonline.com/${data.azurerm_client_config.current.tenant_id}"
+    audience            = "https://azurehealthcareapis.com"
     smart_proxy_enabled = "true"
   }
 
   cors_configuration {
-      allowed_origins    = ["http://www.example.com","http://www.example2.com"]
-      allowed_headers    = ["x-tempo-*","x-tempo2-*"]
-      allowed_methods    = ["GET", "PUT"]
-      max_age_in_seconds = "500"
-	  allow_credentials  = "true"
+    allowed_origins    = ["http://www.example.com", "http://www.example2.com"]
+    allowed_headers    = ["x-tempo-*", "x-tempo2-*"]
+    allowed_methods    = ["GET", "PUT"]
+    max_age_in_seconds = "500"
+    allow_credentials  = "true"
   }
 }
 `, rInt, location, rInt)
diff --git a/azurerm/resource_arm_iothub_test.go b/azurerm/resource_arm_iothub_test.go
index 9100b44cf099..708c55a1b1fa 100644
--- a/azurerm/resource_arm_iothub_test.go
+++ b/azurerm/resource_arm_iothub_test.go
@@ -515,12 +515,12 @@ resource "azurerm_iothub" "test" {
 
   file_upload {
     connection_string  = "${azurerm_storage_account.test.primary_blob_connection_string}"
-	container_name     = "${azurerm_storage_container.test.name}"
-	notifications      = true
-	max_delivery_count = 12
-	sas_ttl            = "PT2H"
-	default_ttl        = "PT3H"
-	lock_duration      = "PT5M"
+    container_name     = "${azurerm_storage_container.test.name}"
+    notifications      = true
+    max_delivery_count = 12
+    sas_ttl            = "PT2H"
+    default_ttl        = "PT3H"
+    lock_duration      = "PT5M"
   }
 }
 `, rInt, location, rStr, rInt)
diff --git a/azurerm/resource_arm_key_vault_test.go b/azurerm/resource_arm_key_vault_test.go
index 01a509e696f2..716b3e4e4ae0 100644
--- a/azurerm/resource_arm_key_vault_test.go
+++ b/azurerm/resource_arm_key_vault_test.go
@@ -878,7 +878,7 @@ resource "azurerm_key_vault" "test" {
   tenant_id           = "${data.azurerm_client_config.current.tenant_id}"
 
   sku_name = "premium"
-%s
+  %s
 }
 
 %s
diff --git a/azurerm/resource_arm_kubernetes_cluster_test.go b/azurerm/resource_arm_kubernetes_cluster_test.go
index d715521072c1..d64827a592db 100644
--- a/azurerm/resource_arm_kubernetes_cluster_test.go
+++ b/azurerm/resource_arm_kubernetes_cluster_test.go
@@ -1500,22 +1500,22 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_virtual_network" "test" {
-	name                = "acctestvirtnet%d"
-	address_space       = ["172.0.0.0/16"]
-	location            = "${azurerm_resource_group.test.location}"
-	resource_group_name = "${azurerm_resource_group.test.name}"
+  name                = "acctestvirtnet%d"
+  address_space       = ["172.0.0.0/16"]
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 
-	tags = {
-	  environment = "Testing"
-	}
+  tags = {
+    environment = "Testing"
   }
+}
 
-  resource "azurerm_subnet" "test" {
-	name                 = "acctestsubnet%d"
-	resource_group_name  = "${azurerm_resource_group.test.name}"
-	virtual_network_name = "${azurerm_virtual_network.test.name}"
-	address_prefix       = "172.0.2.0/24"
-  }
+resource "azurerm_subnet" "test" {
+  name                 = "acctestsubnet%d"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  virtual_network_name = "${azurerm_virtual_network.test.name}"
+  address_prefix       = "172.0.2.0/24"
+}
 
 resource "azurerm_kubernetes_cluster" "test" {
   name                = "acctestaks%d"
@@ -1532,10 +1532,10 @@ resource "azurerm_kubernetes_cluster" "test" {
   }
 
   agent_pool_profile {
-    name    		= "default"
-    count   		= "1"
-	vm_size 		= "Standard_DS2_v2"
-	vnet_subnet_id  = "${azurerm_subnet.test.id}"
+    name           = "default"
+    count          = "1"
+    vm_size        = "Standard_DS2_v2"
+    vnet_subnet_id = "${azurerm_subnet.test.id}"
   }
 
   service_principal {
@@ -2166,7 +2166,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
   dns_prefix          = "acctestaks%d"
-  kubernetes_version = "%s"
+  kubernetes_version  = "%s"
 
 
   linux_profile {
@@ -2190,7 +2190,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   }
 
   network_profile {
-	network_plugin     = "azure"
+    network_plugin    = "azure"
     load_balancer_sku = "Standard"
   }
 }
@@ -2246,7 +2246,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
   dns_prefix          = "acctestaks%d"
-  kubernetes_version = "%s"
+  kubernetes_version  = "%s"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -2272,8 +2272,8 @@ resource "azurerm_kubernetes_cluster" "test" {
     network_plugin     = "azure"
     dns_service_ip     = "10.10.0.10"
     docker_bridge_cidr = "172.18.0.1/16"
-	service_cidr       = "10.10.0.0/16"
-	load_balancer_sku  = "Standard"
+    service_cidr       = "10.10.0.0/16"
+    load_balancer_sku  = "Standard"
   }
 }
 `, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt, currentKubernetesVersion, rInt, clientId, clientSecret)
@@ -2415,7 +2415,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
   dns_prefix          = "acctestaks%d"
-  kubernetes_version = "%s"
+  kubernetes_version  = "%s"
 
   agent_pool_profile {
     name                = "pool1"
@@ -2424,7 +2424,7 @@ resource "azurerm_kubernetes_cluster" "test" {
     enable_auto_scaling = "true"
     type                = "VirtualMachineScaleSets"
     vm_size             = "Standard_DS2_v2"
-    availability_zones   = ["1", "2"]
+    availability_zones  = ["1", "2"]
   }
 
   service_principal {
@@ -2433,7 +2433,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   }
 
   network_profile {
-	network_plugin     = "kubenet"
+    network_plugin    = "kubenet"
     load_balancer_sku = "Standard"
   }
 }
@@ -2465,9 +2465,9 @@ resource "azurerm_kubernetes_cluster" "test" {
     count   = "1"
     type    = "VirtualMachineScaleSets"
     vm_size = "Standard_DS2_v2"
-	node_taints = [
+    node_taints = [
       "key=value:NoSchedule"
-	]
+    ]
   }
 
   service_principal {
diff --git a/azurerm/resource_arm_kusto_cluster_test.go b/azurerm/resource_arm_kusto_cluster_test.go
index c0ee70f2cb50..a66784cde877 100644
--- a/azurerm/resource_arm_kusto_cluster_test.go
+++ b/azurerm/resource_arm_kusto_cluster_test.go
@@ -132,14 +132,14 @@ resource "azurerm_kusto_cluster" "test" {
   name                = "acctestkc%s"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  
+
   sku {
     name     = "Dev(No SLA)_Standard_D11_v2"
     capacity = 1
   }
 
   tags = {
-	label = "test"
+    label = "test"
   }
 }
 `, rInt, location, rs)
@@ -163,8 +163,8 @@ resource "azurerm_kusto_cluster" "test" {
   }
 
   tags = {
-	label = "test1"
-	ENV   = "prod"
+    label = "test1"
+    ENV   = "prod"
   }
 }
 `, rInt, location, rs)
diff --git a/azurerm/resource_arm_kusto_eventhub_data_connection_test.go b/azurerm/resource_arm_kusto_eventhub_data_connection_test.go
index 38c72cead389..7283371a97c3 100644
--- a/azurerm/resource_arm_kusto_eventhub_data_connection_test.go
+++ b/azurerm/resource_arm_kusto_eventhub_data_connection_test.go
@@ -67,7 +67,7 @@ resource "azurerm_eventhub_namespace" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   sku                 = "Standard"
 }
-  
+
 resource "azurerm_eventhub" "test" {
   name                = "acctesteventhub-%d"
   namespace_name      = "${azurerm_eventhub_namespace.test.name}"
@@ -90,7 +90,7 @@ resource "azurerm_kusto_eventhub_data_connection" "test" {
   cluster_name        = "${azurerm_kusto_cluster.test.name}"
   database_name       = "${azurerm_kusto_database.test.name}"
 
-  eventhub_id = "${azurerm_eventhub.test.id}"
+  eventhub_id    = "${azurerm_eventhub.test.id}"
   consumer_group = "${azurerm_eventhub_consumer_group.test.name}"
 }
 `, rInt, location, rs, rInt, rInt, rInt, rInt, rInt)
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_auth_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_auth_test.go
index f51dc121bf5b..04e7696d2fd8 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_auth_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_auth_test.go
@@ -234,13 +234,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_authPassword(rInt int, location s
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go
index bd54411f6749..6022fc809b71 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go
@@ -462,13 +462,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskBasic(rInt int, loca
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -510,13 +511,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskCaching(rInt int, lo
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -558,13 +560,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskResize(rInt int, loc
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -606,13 +609,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskMultiple(rInt int, l
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -661,13 +665,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskStorageAccountType(r
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2s_v2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2s_v2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -709,13 +714,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskStorageAccountTypeUl
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_D2s_v3"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_D2s_v3"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -761,13 +767,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskWriteAcceleratorEnab
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_M8ms"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_M8ms"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -783,10 +790,10 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   data_disk {
-    storage_account_type = "Premium_LRS"
-    caching              = "None"
-    disk_size_gb         = 10
-    lun                  = 10
+    storage_account_type      = "Premium_LRS"
+    caching                   = "None"
+    disk_size_gb              = 10
+    lun                       = 10
     write_accelerator_enabled = true
   }
 
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go
index 6adc32e03e54..841041331a34 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go
@@ -288,13 +288,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksOSDiskCaching(rInt int, loca
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -329,13 +330,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksOSDiskCustomSize(rInt int, l
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -371,13 +373,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksOSDiskEphemeral(rInt int, lo
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2s_v2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2s_v2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -416,13 +419,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksOSDiskStorageAccountType(rIn
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2s_v2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2s_v2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -457,13 +461,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksOSDiskWriteAcceleratorEnable
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_M8ms"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_M8ms"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_identity_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_identity_test.go
index 2d77199689dc..35fdc0423ad2 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_identity_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_identity_test.go
@@ -258,13 +258,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_identitySystemAssigned(rInt int,
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -309,13 +310,14 @@ resource "azurerm_user_assigned_identity" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -342,7 +344,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   identity {
-    type         = "UserAssigned"
+    type = "UserAssigned"
     identity_ids = [
       azurerm_user_assigned_identity.test.id,
     ]
@@ -369,13 +371,14 @@ resource "azurerm_user_assigned_identity" "other" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -402,7 +405,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   identity {
-    type         = "UserAssigned"
+    type = "UserAssigned"
     identity_ids = [
       azurerm_user_assigned_identity.test.id,
       azurerm_user_assigned_identity.other.id,
@@ -424,13 +427,14 @@ resource "azurerm_user_assigned_identity" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -457,7 +461,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   identity {
-    type         = "SystemAssigned, UserAssigned"
+    type = "SystemAssigned, UserAssigned"
     identity_ids = [
       azurerm_user_assigned_identity.test.id,
     ]
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_images_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_images_test.go
index 1fa3b6e9a32c..c81adf8f22fa 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_images_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_images_test.go
@@ -346,15 +346,16 @@ resource "azurerm_lb_rule" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
-  health_probe_id     = azurerm_lb_probe.test.id
-  upgrade_mode        = "Automatic"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+  health_probe_id                 = azurerm_lb_probe.test.id
+  upgrade_mode                    = "Automatic"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -374,17 +375,17 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
     primary = true
 
     ip_configuration {
-	  name      = "internal"
-	  primary   = true
-	  subnet_id = azurerm_subnet.test.id
-	  load_balancer_backend_address_pool_ids = [ azurerm_lb_backend_address_pool.test.id ]
-	  load_balancer_inbound_nat_rules_ids = [ azurerm_lb_nat_pool.test.id ]
+      name                                   = "internal"
+      primary                                = true
+      subnet_id                              = azurerm_subnet.test.id
+      load_balancer_backend_address_pool_ids = [azurerm_lb_backend_address_pool.test.id]
+      load_balancer_inbound_nat_rules_ids    = [azurerm_lb_nat_pool.test.id]
     }
   }
 
   automatic_os_upgrade_policy {
-	disable_automatic_rollback  = true
-	enable_automatic_os_upgrade = true
+    disable_automatic_rollback  = true
+    enable_automatic_os_upgrade = true
   }
 
   rolling_upgrade_policy {
@@ -449,7 +450,7 @@ resource "azurerm_virtual_machine" "source" {
   name                  = "source"
   location              = azurerm_resource_group.test.location
   resource_group_name   = azurerm_resource_group.test.name
-  network_interface_ids = [ azurerm_network_interface.source.id ]
+  network_interface_ids = [azurerm_network_interface.source.id]
   vm_size               = "Standard_F2"
 
   storage_image_reference {
@@ -512,7 +513,7 @@ resource "azurerm_image" "second" {
     caching  = "None"
   }
 
-  depends_on = [ "azurerm_image.first" ]
+  depends_on = ["azurerm_image.first"]
 }
 `, template)
 }
@@ -530,6 +531,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   instances           = 1
   admin_username      = "mradministrator"
   admin_password      = "P@ssword1234!"
+ 
   disable_password_authentication = false
   source_image_id     = azurerm_image.%s.id
 
@@ -558,13 +560,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_imagesManualUpdate(rInt int, loca
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -599,14 +602,15 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_imagesManualUpdateExternalRoll(rI
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
-  disable_password_authentication = false
+  name                                          = "acctestvmss-%d"
+  resource_group_name                           = azurerm_resource_group.test.name
+  location                                      = azurerm_resource_group.test.location
+  sku                                           = "Standard_F2"
+  instances                                     = 1
+  admin_username                                = "adminuser"
+  admin_password                                = "P@ssword1234!"
+ 
+  disable_password_authentication               = false
   terraform_should_roll_instances_when_required = false
 
   source_image_reference {
@@ -697,15 +701,16 @@ resource "azurerm_lb_rule" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
-  health_probe_id     = azurerm_lb_probe.test.id
-  upgrade_mode        = "Rolling"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+  health_probe_id                 = azurerm_lb_probe.test.id
+  upgrade_mode                    = "Rolling"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -725,11 +730,11 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
     primary = true
 
     ip_configuration {
-      name      = "internal"
-      primary   = true
-      subnet_id = azurerm_subnet.test.id
-      load_balancer_backend_address_pool_ids = [ azurerm_lb_backend_address_pool.test.id ]
-      load_balancer_inbound_nat_rules_ids = [ azurerm_lb_nat_pool.test.id ]
+      name                                   = "internal"
+      primary                                = true
+      subnet_id                              = azurerm_subnet.test.id
+      load_balancer_backend_address_pool_ids = [azurerm_lb_backend_address_pool.test.id]
+      load_balancer_inbound_nat_rules_ids    = [azurerm_lb_nat_pool.test.id]
     }
   }
 
@@ -757,13 +762,14 @@ resource "azurerm_marketplace_agreement" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -795,7 +801,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
     publisher = "cloudbees"
   }
 
-  depends_on = [ "azurerm_marketplace_agreement.test" ]
+  depends_on = ["azurerm_marketplace_agreement.test"]
 }
 `, template, rInt)
 }
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_network_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_network_test.go
index 8a588c606857..54271fd3f4a1 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_network_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_network_test.go
@@ -853,13 +853,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkAcceleratedNetworking(rInt
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F4"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F4"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -875,8 +876,8 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "example"
-    primary = true
+    name                          = "example"
+    primary                       = true
     enable_accelerated_networking = %t
 
     ip_configuration {
@@ -902,13 +903,14 @@ resource "azurerm_subnet" "other" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -928,10 +930,10 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
     primary = true
 
     ip_configuration {
-      name      = "internal"
-      primary   = true
-      subnet_id = azurerm_subnet.other.id
-      application_gateway_backend_address_pool_ids = [ azurerm_application_gateway.test.backend_address_pool.0.id ]
+      name                                         = "internal"
+      primary                                      = true
+      subnet_id                                    = azurerm_subnet.other.id
+      application_gateway_backend_address_pool_ids = [azurerm_application_gateway.test.backend_address_pool.0.id]
     }
   }
 }
@@ -950,13 +952,14 @@ resource "azurerm_application_security_group" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -976,10 +979,10 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
     primary = true
 
     ip_configuration {
-      name      = "internal"
-      primary   = true
-      subnet_id = azurerm_subnet.test.id
-      application_security_group_ids = [ azurerm_application_security_group.test.id ]
+      name                           = "internal"
+      primary                        = true
+      subnet_id                      = azurerm_subnet.test.id
+      application_security_group_ids = [azurerm_application_security_group.test.id]
     }
   }
 }
@@ -1004,13 +1007,14 @@ resource "azurerm_application_security_group" "other" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1049,13 +1053,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkDNSServers(rInt int, locat
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1071,8 +1076,8 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "example"
-    primary = true
+    name        = "example"
+    primary     = true
     dns_servers = ["8.8.8.8"]
 
     ip_configuration {
@@ -1091,13 +1096,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkDNSServersUpdated(rInt int
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1113,8 +1119,8 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "example"
-    primary = true
+    name        = "example"
+    primary     = true
     dns_servers = ["1.1.1.1", "8.8.8.8"]
 
     ip_configuration {
@@ -1133,13 +1139,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkIPForwarding(rInt int, loc
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1155,8 +1162,8 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "example"
-    primary = true
+    name                 = "example"
+    primary              = true
     enable_ip_forwarding = true
 
     ip_configuration {
@@ -1175,13 +1182,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkIPv6(rInt int, location st
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1252,13 +1260,14 @@ resource "azurerm_lb_nat_pool" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1278,11 +1287,11 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
     primary = true
 
     ip_configuration {
-      name      = "internal"
-      primary   = true
-      subnet_id = azurerm_subnet.test.id
-      load_balancer_backend_address_pool_ids = [ azurerm_lb_backend_address_pool.test.id ]
-      load_balancer_inbound_nat_rules_ids = [ azurerm_lb_nat_pool.test.id ]
+      name                                   = "internal"
+      primary                                = true
+      subnet_id                              = azurerm_subnet.test.id
+      load_balancer_backend_address_pool_ids = [azurerm_lb_backend_address_pool.test.id]
+      load_balancer_inbound_nat_rules_ids    = [azurerm_lb_nat_pool.test.id]
     }
   }
 }
@@ -1295,13 +1304,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkMultipleIPConfigurations(r
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1341,13 +1351,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkMultipleIPConfigurationsIP
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_D2s_v3"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_D2s_v3"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1388,13 +1399,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkMultipleNICs(rInt int, loc
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1421,7 +1433,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "secondary"
+    name = "secondary"
 
     ip_configuration {
       name      = "internal"
@@ -1439,13 +1451,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkMultipleNICsMultipleIPConf
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1477,7 +1490,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "secondary"
+    name = "secondary"
 
     ip_configuration {
       name      = "third"
@@ -1500,13 +1513,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkMultipleNICsWithDifferentD
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1522,8 +1536,8 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "primary"
-    primary = true
+    name        = "primary"
+    primary     = true
     dns_servers = ["8.8.8.8"]
 
     ip_configuration {
@@ -1534,7 +1548,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "secondary"
+    name        = "secondary"
     dns_servers = ["1.1.1.1"]
 
     ip_configuration {
@@ -1553,13 +1567,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkMultipleNICsMultiplePublic
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1592,7 +1607,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "secondary"
+    name = "secondary"
 
     ip_configuration {
       name      = "second"
@@ -1622,13 +1637,14 @@ resource "azurerm_network_security_group" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1644,8 +1660,8 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "example"
-    primary = true
+    name                      = "example"
+    primary                   = true
     network_security_group_id = azurerm_network_security_group.test.id
 
     ip_configuration {
@@ -1676,13 +1692,14 @@ resource "azurerm_network_security_group" "other" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1698,8 +1715,8 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "example"
-    primary = true
+    name                      = "example"
+    primary                   = true
     network_security_group_id = azurerm_network_security_group.other.id
 
     ip_configuration {
@@ -1718,13 +1735,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkPrivate(rInt int, location
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1759,13 +1777,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkPublicIP(rInt int, locatio
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1805,13 +1824,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkPublicIPDomainNameLabel(rI
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1858,13 +1878,14 @@ resource "azurerm_public_ip_prefix" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1889,8 +1910,8 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
       subnet_id = azurerm_subnet.test.id
 
       public_ip_address {
-        name                 = "first"
-        public_ip_prefix_id  = azurerm_public_ip_prefix.test.id
+        name                = "first"
+        public_ip_prefix_id = azurerm_public_ip_prefix.test.id
       }
     }
   }
@@ -1904,13 +1925,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkPublicIPTags(rInt int, loc
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1935,7 +1957,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
       subnet_id = azurerm_subnet.test.id
 
       public_ip_address {
-        name                 = "first"
+        name = "first"
 
         ip_tag {
           tag  = "/Sql"
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_other_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_other_test.go
index 58d98796b0ee..9495870487a4 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_other_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_other_test.go
@@ -574,13 +574,14 @@ resource "azurerm_storage_account" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -627,13 +628,14 @@ resource "azurerm_storage_account" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -668,14 +670,15 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherComputerNamePrefix(rInt int,
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  computer_name_prefix = "morty"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+  computer_name_prefix            = "morty"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -718,6 +721,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   admin_username       = "adminuser"
   admin_password       = "P@ssword1234!"
   custom_data          = base64encode(%q)
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -752,15 +756,16 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProv
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  overprovision        = true
-  disable_password_authentication = false
+  name                                              = "acctestvmss-%d"
+  resource_group_name                               = azurerm_resource_group.test.name
+  location                                          = azurerm_resource_group.test.location
+  sku                                               = "Standard_F2"
+  instances                                         = 1
+  admin_username                                    = "adminuser"
+  admin_password                                    = "P@ssword1234!"
+  overprovision                                     = true
+
+  disable_password_authentication                   = false
   do_not_run_extensions_on_overprovisioned_machines = true
 
   source_image_reference {
@@ -795,15 +800,16 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherPriorityLow(rInt int, locati
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
-  eviction_policy     = %q
-  priority            = "Low"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+  eviction_policy                 = %q
+  priority                        = "Low"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -838,16 +844,17 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherPriorityLowMaxBidPrice(rInt
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
-  eviction_policy     = "Delete"
-  priority            = "Low"
-  max_bid_price       = %q
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+  eviction_policy                 = "Delete"
+  priority                        = "Low"
+  max_bid_price                   = %q
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -882,14 +889,15 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherPriorityRegular(rInt int, lo
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                = "acctestvmss-%d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
-  priority            = "Regular"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+  priority                        = "Regular"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -931,6 +939,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "import" {
   instances           = azurerm_linux_virtual_machine_scale_set.test.instances
   admin_username      = azurerm_linux_virtual_machine_scale_set.test.admin_username
   admin_password      = "azurerm_linux_virtual_machine_scale_set.test.admin_password
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -965,13 +974,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherSecret(rInt int, location st
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1014,13 +1024,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherSecretRemoved(rInt int, loca
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1055,13 +1066,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherSecretUpdated(rInt int, loca
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1115,9 +1127,9 @@ resource "azurerm_key_vault" "test" {
   resource_group_name = azurerm_resource_group.test.name
   tenant_id           = data.azurerm_client_config.current.tenant_id
 
-  sku_name = "standard"
+  sku_name                        = "standard"
   enabled_for_template_deployment = true
-  enabled_for_deployment = true
+  enabled_for_deployment          = true
 
   access_policy {
     tenant_id = data.azurerm_client_config.current.tenant_id
@@ -1244,13 +1256,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherTags(rInt int, location stri
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1289,13 +1302,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherTagsUpdated(rInt int, locati
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -1335,13 +1349,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherVMAgent(rInt int, location s
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
   provision_vm_agent              = %t
 
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_scaling_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_scaling_test.go
index 004cdf6236a0..ad089c588e79 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_scaling_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_scaling_test.go
@@ -427,15 +427,16 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingAutoScale(rInt int, locati
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 2
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  disable_password_authentication = false
-  overprovision = true
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 2
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+  overprovision                   = true
+
+disable_password_authentication = false
 
   source_image_reference {
     publisher = "Canonical"
@@ -526,13 +527,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingInstanceCount(rInt int, lo
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = %d
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = %d
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -567,13 +569,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingInstanceCountIgnoreUpdated
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F4"
-  instances            = %d
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F4"
+  instances                       = %d
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -600,7 +603,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
   }
 
   lifecycle {
-    ignore_changes = [ "sku" ]
+    ignore_changes = ["sku"]
   }
 }
 `, template, rInt, instanceCount)
@@ -612,14 +615,15 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingOverProvisionDisabled(rInt
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 3
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  overprovision        = false
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 3
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+  overprovision                   = false
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -660,15 +664,16 @@ resource "azurerm_proximity_placement_group" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
-  proximity_placement_group_id = azurerm_proximity_placement_group.test.id
+  proximity_placement_group_id    = azurerm_proximity_placement_group.test.id
 
   source_image_reference {
     publisher = "Canonical"
@@ -702,13 +707,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingSinglePlacementGroupDisabl
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
   single_placement_group          = false
 
@@ -744,13 +750,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingUpdateSku(rInt int, locati
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = %q
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = %q
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -785,13 +792,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingUpdateSkuIgnoredUpdatedCou
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = %q
-  instances            = 5
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = %q
+  instances                       = 5
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+ 
   disable_password_authentication = false
 
   source_image_reference {
@@ -830,14 +838,15 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingZonesSingle(rInt int, loca
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  zones                = [ "1" ]
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 1
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+  zones                           = ["1"]
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -872,14 +881,15 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingZonesMultiple(rInt int, lo
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 2
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  zones                = [ "1", "2" ]
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 2
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+  zones                           = ["1", "2"]
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -914,15 +924,16 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingZonesBalance(rInt int, loc
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                 = "acctestvmss-%d"
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 4
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  zones                = [ "1", "2" ]
-  zone_balance         = true
+  name                            = "acctestvmss-%d"
+  resource_group_name             = azurerm_resource_group.test.name
+  location                        = azurerm_resource_group.test.location
+  sku                             = "Standard_F2"
+  instances                       = 4
+  admin_username                  = "adminuser"
+  admin_password                  = "P@ssword1234!"
+  zones                           = ["1", "2"]
+  zone_balance                    = true
+
   disable_password_authentication = false
 
   source_image_reference {
diff --git a/azurerm/resource_arm_mariadb_server_test.go b/azurerm/resource_arm_mariadb_server_test.go
index 5958aea13f23..11e5ba56ec44 100644
--- a/azurerm/resource_arm_mariadb_server_test.go
+++ b/azurerm/resource_arm_mariadb_server_test.go
@@ -634,7 +634,7 @@ resource "azurerm_mariadb_server" "test" {
     storage_mb            = 51200
     backup_retention_days = 7
     geo_redundant_backup  = "Disabled"
-	auto_grow      		  = "Disabled"
+    auto_grow             = "Disabled"
   }
 
   administrator_login          = "acctestun"
diff --git a/azurerm/resource_arm_monitor_action_group_test.go b/azurerm/resource_arm_monitor_action_group_test.go
index d64b40e23baa..4dfdab011857 100644
--- a/azurerm/resource_arm_monitor_action_group_test.go
+++ b/azurerm/resource_arm_monitor_action_group_test.go
@@ -423,9 +423,9 @@ resource "azurerm_monitor_action_group" "test" {
   short_name          = "acctestag"
 
   webhook_receiver {
-    name        = "callmyapiaswell"
-	service_uri = "http://example.com/alert"
-	use_common_alert_schema = true
+    name                    = "callmyapiaswell"
+    service_uri             = "http://example.com/alert"
+    use_common_alert_schema = true
   }
 }
 `, rInt, location, rInt)
@@ -471,9 +471,9 @@ resource "azurerm_monitor_action_group" "test" {
   }
 
   webhook_receiver {
-    name        = "callmybackupapi"
-	service_uri = "https://backup.example.com/warning"
-	use_common_alert_schema = true
+    name                    = "callmybackupapi"
+    service_uri             = "https://backup.example.com/warning"
+    use_common_alert_schema = true
   }
 }
 `, rInt, location, rInt)
diff --git a/azurerm/resource_arm_monitor_diagnostic_setting_test.go b/azurerm/resource_arm_monitor_diagnostic_setting_test.go
index 0376d651bf03..60ed2074c619 100644
--- a/azurerm/resource_arm_monitor_diagnostic_setting_test.go
+++ b/azurerm/resource_arm_monitor_diagnostic_setting_test.go
@@ -412,7 +412,7 @@ resource "azurerm_monitor_diagnostic_setting" "test" {
 
   log {
     category = "PipelineRuns"
-    enabled = false
+    enabled  = false
 
     retention_policy {
       enabled = false
@@ -421,7 +421,7 @@ resource "azurerm_monitor_diagnostic_setting" "test" {
 
   log {
     category = "TriggerRuns"
-    enabled = false
+    enabled  = false
 
     retention_policy {
       enabled = false
@@ -430,7 +430,7 @@ resource "azurerm_monitor_diagnostic_setting" "test" {
 
   metric {
     category = "AllMetrics"
-    enabled = false
+    enabled  = false
 
     retention_policy {
       enabled = false
diff --git a/azurerm/resource_arm_mysql_server_test.go b/azurerm/resource_arm_mysql_server_test.go
index a69a21a3ec1b..ece0af796d12 100644
--- a/azurerm/resource_arm_mysql_server_test.go
+++ b/azurerm/resource_arm_mysql_server_test.go
@@ -576,7 +576,7 @@ resource "azurerm_mysql_server" "test" {
     storage_mb            = 51200
     backup_retention_days = 7
     geo_redundant_backup  = "Disabled"
-	auto_grow			  = "Disabled"
+    auto_grow             = "Disabled"
   }
 
   administrator_login          = "acctestun"
diff --git a/azurerm/resource_arm_notification_hub_authorization_rule_test.go b/azurerm/resource_arm_notification_hub_authorization_rule_test.go
index f3298ce42cd6..a60ad25b207d 100644
--- a/azurerm/resource_arm_notification_hub_authorization_rule_test.go
+++ b/azurerm/resource_arm_notification_hub_authorization_rule_test.go
@@ -342,21 +342,21 @@ resource "azurerm_notification_hub_authorization_rule" "test1" {
 }
 
 resource "azurerm_notification_hub_authorization_rule" "test2" {
-	name                  = "acctestruletwo-%d"
-	notification_hub_name = "${azurerm_notification_hub.test.name}"
-	namespace_name        = "${azurerm_notification_hub_namespace.test.name}"
-	resource_group_name   = "${azurerm_resource_group.test.name}"
-	send                  = true
-	listen                = true
+  name                  = "acctestruletwo-%d"
+  notification_hub_name = "${azurerm_notification_hub.test.name}"
+  namespace_name        = "${azurerm_notification_hub_namespace.test.name}"
+  resource_group_name   = "${azurerm_resource_group.test.name}"
+  send                  = true
+  listen                = true
 }
 
 resource "azurerm_notification_hub_authorization_rule" "test3" {
-	name                  = "acctestrulethree-%d"
-	notification_hub_name = "${azurerm_notification_hub.test.name}"
-	namespace_name        = "${azurerm_notification_hub_namespace.test.name}"
-	resource_group_name   = "${azurerm_resource_group.test.name}"
-	send                  = true
-	listen                = true
+  name                  = "acctestrulethree-%d"
+  notification_hub_name = "${azurerm_notification_hub.test.name}"
+  namespace_name        = "${azurerm_notification_hub_namespace.test.name}"
+  resource_group_name   = "${azurerm_resource_group.test.name}"
+  send                  = true
+  listen                = true
 }
 
 `, template, ri, ri, ri)
diff --git a/azurerm/resource_arm_private_dns_zone_virtual_network_link_test.go b/azurerm/resource_arm_private_dns_zone_virtual_network_link_test.go
index 1949d4cf3747..f828b69902aa 100644
--- a/azurerm/resource_arm_private_dns_zone_virtual_network_link_test.go
+++ b/azurerm/resource_arm_private_dns_zone_virtual_network_link_test.go
@@ -186,10 +186,10 @@ resource "azurerm_private_dns_zone" "test" {
 }
 
 resource "azurerm_private_dns_zone_virtual_network_link" "test" {
-  name                	= "acctest%d"
+  name                  = "acctest%d"
   private_dns_zone_name = "${azurerm_private_dns_zone.test.name}"
-  virtual_network_id 	= "${azurerm_virtual_network.test.id}"
-  resource_group_name 	= "${azurerm_resource_group.test.name}"
+  virtual_network_id    = "${azurerm_virtual_network.test.id}"
+  resource_group_name   = "${azurerm_resource_group.test.name}"
 }
 
 `, rInt, location, rInt, rInt, rInt)
@@ -234,11 +234,11 @@ resource "azurerm_private_dns_zone" "test" {
 }
 
 resource "azurerm_private_dns_zone_virtual_network_link" "test" {
-  name                	= "acctest%d"
+  name                  = "acctest%d"
   private_dns_zone_name = "${azurerm_private_dns_zone.test.name}"
-  virtual_network_id 	= "${azurerm_virtual_network.test.id}"
-  resource_group_name 	= "${azurerm_resource_group.test.name}"
-	
+  virtual_network_id    = "${azurerm_virtual_network.test.id}"
+  resource_group_name   = "${azurerm_resource_group.test.name}"
+
   tags = {
     environment = "Production"
     cost_center = "MSFT"
@@ -272,11 +272,11 @@ resource "azurerm_private_dns_zone" "test" {
 }
 
 resource "azurerm_private_dns_zone_virtual_network_link" "test" {
-  name                	= "acctestzone%d.com"
+  name                  = "acctestzone%d.com"
   private_dns_zone_name = "${azurerm_private_dns_zone.test.name}"
-  virtual_network_id 	= "${azurerm_virtual_network.test.id}"
-  resource_group_name 	= "${azurerm_resource_group.test.name}"
-	
+  virtual_network_id    = "${azurerm_virtual_network.test.id}"
+  resource_group_name   = "${azurerm_resource_group.test.name}"
+
   tags = {
     environment = "staging"
   }
diff --git a/azurerm/resource_arm_recovery_services_fabric_test.go b/azurerm/resource_arm_recovery_services_fabric_test.go
index 0966b005c193..f5b047b806e2 100644
--- a/azurerm/resource_arm_recovery_services_fabric_test.go
+++ b/azurerm/resource_arm_recovery_services_fabric_test.go
@@ -51,10 +51,10 @@ resource "azurerm_recovery_services_vault" "test" {
 }
 
 resource "azurerm_recovery_services_fabric" "test" {
-  resource_group_name          = "${azurerm_resource_group.test.name}"
-  recovery_vault_name          = "${azurerm_recovery_services_vault.test.name}"
-  name                         = "acctest-fabric-%d"
-  location                     = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  recovery_vault_name = "${azurerm_recovery_services_vault.test.name}"
+  name                = "acctest-fabric-%d"
+  location            = "${azurerm_resource_group.test.location}"
 }
 `, rInt, location, rInt, rInt)
 }
diff --git a/azurerm/resource_arm_recovery_services_network_mapping_test.go b/azurerm/resource_arm_recovery_services_network_mapping_test.go
index 30ee32c821d2..e1669eb94313 100644
--- a/azurerm/resource_arm_recovery_services_network_mapping_test.go
+++ b/azurerm/resource_arm_recovery_services_network_mapping_test.go
@@ -41,44 +41,44 @@ func TestAccAzureRMRecoveryNetworkMapping_basic(t *testing.T) {
 func testAccAzureRMRecoveryNetworkMapping_basic(rInt int, location string, altLocation string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {
-  name                        = "acctestRG1-%d"
-  location                    = "%s"
+  name     = "acctestRG1-%d"
+  location = "%s"
 }
 
 resource "azurerm_recovery_services_vault" "test" {
-  name                        = "acctest-vault-%d"
-  location                    = "${azurerm_resource_group.test.location}"
-  resource_group_name         = "${azurerm_resource_group.test.name}"
-  sku                         = "Standard"
+  name                = "acctest-vault-%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  sku                 = "Standard"
 }
 
 resource "azurerm_recovery_services_fabric" "test1" {
-  resource_group_name         = "${azurerm_resource_group.test.name}"
-  recovery_vault_name         = "${azurerm_recovery_services_vault.test.name}"
-  name                        = "acctest-fabric1-%d"
-  location                    = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  recovery_vault_name = "${azurerm_recovery_services_vault.test.name}"
+  name                = "acctest-fabric1-%d"
+  location            = "${azurerm_resource_group.test.location}"
 }
 
 resource "azurerm_recovery_services_fabric" "test2" {
-  resource_group_name         = "${azurerm_resource_group.test.name}"
-  recovery_vault_name         = "${azurerm_recovery_services_vault.test.name}"
-  name                        = "acctest-fabric2-%d"
-  location                    = "%s"
-  depends_on                  = ["azurerm_recovery_services_fabric.test1"]
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  recovery_vault_name = "${azurerm_recovery_services_vault.test.name}"
+  name                = "acctest-fabric2-%d"
+  location            = "%s"
+  depends_on          = ["azurerm_recovery_services_fabric.test1"]
 }
 
 resource "azurerm_virtual_network" "test1" {
-  name                        = "network1-%d"
-  resource_group_name         = "${azurerm_resource_group.test.name}"
-  address_space               = [ "192.168.1.0/24" ]
-  location                    = "${azurerm_recovery_services_fabric.test1.location}"
+  name                = "network1-%d"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  address_space       = ["192.168.1.0/24"]
+  location            = "${azurerm_recovery_services_fabric.test1.location}"
 }
 
 resource "azurerm_virtual_network" "test2" {
-  name                        = "network2-%d"
-  resource_group_name         = "${azurerm_resource_group.test.name}"
-  address_space               = [ "192.168.2.0/24" ]
-  location                    = "${azurerm_recovery_services_fabric.test2.location}"
+  name                = "network2-%d"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  address_space       = ["192.168.2.0/24"]
+  location            = "${azurerm_recovery_services_fabric.test2.location}"
 }
 
 resource "azurerm_recovery_network_mapping" "test" {
diff --git a/azurerm/resource_arm_recovery_services_protected_vm_test.go b/azurerm/resource_arm_recovery_services_protected_vm_test.go
index fdbcad9cd4dd..12acecf80449 100644
--- a/azurerm/resource_arm_recovery_services_protected_vm_test.go
+++ b/azurerm/resource_arm_recovery_services_protected_vm_test.go
@@ -508,12 +508,12 @@ func testAccAzureRMRecoveryServicesProtectedVm_withVM(rInt int, location string)
 %[1]s
 
 resource "azurerm_virtual_machine" "test" {
-  name                  = "acctestvm-%[2]d"
-  location              = "${azurerm_resource_group.test.location}"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
-  vm_size               = "Standard_A0"
-  network_interface_ids = ["${azurerm_network_interface.test.id}"]
-  delete_os_disk_on_termination    = true
+  name                          = "acctestvm-%[2]d"
+  location                      = "${azurerm_resource_group.test.location}"
+  resource_group_name           = "${azurerm_resource_group.test.name}"
+  vm_size                       = "Standard_A0"
+  network_interface_ids         = ["${azurerm_network_interface.test.id}"]
+  delete_os_disk_on_termination = true
 
   storage_image_reference {
     publisher = "Canonical"
diff --git a/azurerm/resource_arm_recovery_services_protection_container_mapping_test.go b/azurerm/resource_arm_recovery_services_protection_container_mapping_test.go
index 79b64d7e155b..a1fae48f7c80 100644
--- a/azurerm/resource_arm_recovery_services_protection_container_mapping_test.go
+++ b/azurerm/resource_arm_recovery_services_protection_container_mapping_test.go
@@ -53,50 +53,50 @@ resource "azurerm_recovery_services_vault" "test" {
 }
 
 resource "azurerm_recovery_services_fabric" "test1" {
-  resource_group_name          = "${azurerm_resource_group.test1.name}"
-  recovery_vault_name          = "${azurerm_recovery_services_vault.test.name}"
-  name                         = "acctest-fabric1-%d"
-  location                     = "${azurerm_resource_group.test1.location}"
+  resource_group_name = "${azurerm_resource_group.test1.name}"
+  recovery_vault_name = "${azurerm_recovery_services_vault.test.name}"
+  name                = "acctest-fabric1-%d"
+  location            = "${azurerm_resource_group.test1.location}"
 }
 
 resource "azurerm_recovery_services_fabric" "test2" {
-  resource_group_name          = "${azurerm_resource_group.test1.name}"
-  recovery_vault_name          = "${azurerm_recovery_services_vault.test.name}"
-  name                         = "acctest-fabric2-%d"
-  location                     = "%s"
-  depends_on                   = ["azurerm_recovery_services_fabric.test1"]
+  resource_group_name = "${azurerm_resource_group.test1.name}"
+  recovery_vault_name = "${azurerm_recovery_services_vault.test.name}"
+  name                = "acctest-fabric2-%d"
+  location            = "%s"
+  depends_on          = ["azurerm_recovery_services_fabric.test1"]
 }
 
 resource "azurerm_recovery_services_protection_container" "test1" {
-  resource_group_name           = "${azurerm_resource_group.test1.name}"
-  recovery_vault_name           = "${azurerm_recovery_services_vault.test.name}"
-  recovery_fabric_name          = "${azurerm_recovery_services_fabric.test1.name}"
-  name                          = "acctest-protection-cont1-%d"
+  resource_group_name  = "${azurerm_resource_group.test1.name}"
+  recovery_vault_name  = "${azurerm_recovery_services_vault.test.name}"
+  recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}"
+  name                 = "acctest-protection-cont1-%d"
 }
 
 resource "azurerm_recovery_services_protection_container" "test2" {
-  resource_group_name           = "${azurerm_resource_group.test1.name}"
-  recovery_vault_name           = "${azurerm_recovery_services_vault.test.name}"
-  recovery_fabric_name          = "${azurerm_recovery_services_fabric.test2.name}"
-  name                          = "acctest-protection-cont2-%d"
+  resource_group_name  = "${azurerm_resource_group.test1.name}"
+  recovery_vault_name  = "${azurerm_recovery_services_vault.test.name}"
+  recovery_fabric_name = "${azurerm_recovery_services_fabric.test2.name}"
+  name                 = "acctest-protection-cont2-%d"
 }
 
 resource "azurerm_recovery_services_replication_policy" "test" {
-  resource_group_name           = "${azurerm_resource_group.test1.name}"
-  recovery_vault_name           = "${azurerm_recovery_services_vault.test.name}"
-  name                          = "acctest-policy-%d"
-  recovery_point_retention_in_minutes = "${24 * 60}"
+  resource_group_name                                  = "${azurerm_resource_group.test1.name}"
+  recovery_vault_name                                  = "${azurerm_recovery_services_vault.test.name}"
+  name                                                 = "acctest-policy-%d"
+  recovery_point_retention_in_minutes                  = "${24 * 60}"
   application_consistent_snapshot_frequency_in_minutes = "${4 * 60}"
 }
 
 resource "azurerm_recovery_services_protection_container_mapping" "test" {
-  resource_group_name            = "${azurerm_resource_group.test1.name}"
-  recovery_vault_name            = "${azurerm_recovery_services_vault.test.name}"
-  recovery_fabric_name           = "${azurerm_recovery_services_fabric.test1.name}"
+  resource_group_name                       = "${azurerm_resource_group.test1.name}"
+  recovery_vault_name                       = "${azurerm_recovery_services_vault.test.name}"
+  recovery_fabric_name                      = "${azurerm_recovery_services_fabric.test1.name}"
   recovery_source_protection_container_name = "${azurerm_recovery_services_protection_container.test1.name}"
-  recovery_target_protection_container_id = "${azurerm_recovery_services_protection_container.test2.id}"
-  recovery_replication_policy_id = "${azurerm_recovery_services_replication_policy.test.id}"
-  name                           = "mapping-%d"
+  recovery_target_protection_container_id   = "${azurerm_recovery_services_protection_container.test2.id}"
+  recovery_replication_policy_id            = "${azurerm_recovery_services_replication_policy.test.id}"
+  name                                      = "mapping-%d"
 }
 `, rInt, location, rInt, rInt, rInt, altLocation, rInt, rInt, rInt, rInt)
 }
diff --git a/azurerm/resource_arm_recovery_services_protection_container_test.go b/azurerm/resource_arm_recovery_services_protection_container_test.go
index 98b098f1d3d1..29ebc56eceed 100644
--- a/azurerm/resource_arm_recovery_services_protection_container_test.go
+++ b/azurerm/resource_arm_recovery_services_protection_container_test.go
@@ -52,17 +52,17 @@ resource "azurerm_recovery_services_vault" "test" {
 }
 
 resource "azurerm_recovery_services_fabric" "test" {
-  resource_group_name          = "${azurerm_resource_group.test.name}"
-  recovery_vault_name          = "${azurerm_recovery_services_vault.test.name}"
-  name                         = "acctest-fabric-%d"
-  location                     = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  recovery_vault_name = "${azurerm_recovery_services_vault.test.name}"
+  name                = "acctest-fabric-%d"
+  location            = "${azurerm_resource_group.test.location}"
 }
 
 resource "azurerm_recovery_services_protection_container" "test" {
-  resource_group_name          = "${azurerm_resource_group.test.name}"
-  recovery_vault_name          = "${azurerm_recovery_services_vault.test.name}"
-  recovery_fabric_name         = "${azurerm_recovery_services_fabric.test.name}"
-  name                         = "acctest-protection-cont-%d"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  recovery_vault_name  = "${azurerm_recovery_services_vault.test.name}"
+  recovery_fabric_name = "${azurerm_recovery_services_fabric.test.name}"
+  name                 = "acctest-protection-cont-%d"
 }
 
 `, rInt, location, rInt, rInt, rInt)
diff --git a/azurerm/resource_arm_recovery_services_replicated_vm_test.go b/azurerm/resource_arm_recovery_services_replicated_vm_test.go
index f94989b4924c..a9c48630a1ec 100644
--- a/azurerm/resource_arm_recovery_services_replicated_vm_test.go
+++ b/azurerm/resource_arm_recovery_services_replicated_vm_test.go
@@ -58,157 +58,157 @@ resource "azurerm_recovery_services_vault" "test" {
 }
 
 resource "azurerm_recovery_services_fabric" "test1" {
-  resource_group_name          = "${azurerm_resource_group.test2.name}"
-  recovery_vault_name          = "${azurerm_recovery_services_vault.test.name}"
-  name                         = "acctest-fabric1-%d"
-  location                     = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test2.name}"
+  recovery_vault_name = "${azurerm_recovery_services_vault.test.name}"
+  name                = "acctest-fabric1-%d"
+  location            = "${azurerm_resource_group.test.location}"
 }
 
 resource "azurerm_recovery_services_fabric" "test2" {
-  resource_group_name          = "${azurerm_resource_group.test2.name}"
-  recovery_vault_name          = "${azurerm_recovery_services_vault.test.name}"
-  name                         = "acctest-fabric2-%d"
-  location                     = "${azurerm_resource_group.test2.location}"
-  depends_on                   = ["azurerm_recovery_services_fabric.test1"]
+  resource_group_name = "${azurerm_resource_group.test2.name}"
+  recovery_vault_name = "${azurerm_recovery_services_vault.test.name}"
+  name                = "acctest-fabric2-%d"
+  location            = "${azurerm_resource_group.test2.location}"
+  depends_on          = ["azurerm_recovery_services_fabric.test1"]
 }
 
 resource "azurerm_recovery_services_protection_container" "test1" {
-  resource_group_name           = "${azurerm_resource_group.test2.name}"
-  recovery_vault_name           = "${azurerm_recovery_services_vault.test.name}"
-  recovery_fabric_name          = "${azurerm_recovery_services_fabric.test1.name}"
-  name                          = "acctest-protection-cont1-%d"
+  resource_group_name  = "${azurerm_resource_group.test2.name}"
+  recovery_vault_name  = "${azurerm_recovery_services_vault.test.name}"
+  recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}"
+  name                 = "acctest-protection-cont1-%d"
 }
 
 resource "azurerm_recovery_services_protection_container" "test2" {
-  resource_group_name           = "${azurerm_resource_group.test2.name}"
-  recovery_vault_name           = "${azurerm_recovery_services_vault.test.name}"
-  recovery_fabric_name          = "${azurerm_recovery_services_fabric.test2.name}"
-  name                          = "acctest-protection-cont2-%d"
+  resource_group_name  = "${azurerm_resource_group.test2.name}"
+  recovery_vault_name  = "${azurerm_recovery_services_vault.test.name}"
+  recovery_fabric_name = "${azurerm_recovery_services_fabric.test2.name}"
+  name                 = "acctest-protection-cont2-%d"
 }
 
 resource "azurerm_recovery_services_replication_policy" "test" {
-  resource_group_name           = "${azurerm_resource_group.test2.name}"
-  recovery_vault_name           = "${azurerm_recovery_services_vault.test.name}"
-  name                          = "acctest-policy-%d"
-  recovery_point_retention_in_minutes = "${24 * 60}"
+  resource_group_name                                  = "${azurerm_resource_group.test2.name}"
+  recovery_vault_name                                  = "${azurerm_recovery_services_vault.test.name}"
+  name                                                 = "acctest-policy-%d"
+  recovery_point_retention_in_minutes                  = "${24 * 60}"
   application_consistent_snapshot_frequency_in_minutes = "${4 * 60}"
 }
 
 resource "azurerm_recovery_services_protection_container_mapping" "test" {
-  resource_group_name            = "${azurerm_resource_group.test2.name}"
-  recovery_vault_name            = "${azurerm_recovery_services_vault.test.name}"
-  recovery_fabric_name           = "${azurerm_recovery_services_fabric.test1.name}"
+  resource_group_name                       = "${azurerm_resource_group.test2.name}"
+  recovery_vault_name                       = "${azurerm_recovery_services_vault.test.name}"
+  recovery_fabric_name                      = "${azurerm_recovery_services_fabric.test1.name}"
   recovery_source_protection_container_name = "${azurerm_recovery_services_protection_container.test1.name}"
-  recovery_target_protection_container_id = "${azurerm_recovery_services_protection_container.test2.id}"
-  recovery_replication_policy_id = "${azurerm_recovery_services_replication_policy.test.id}"
-  name                           = "mapping-%d"
+  recovery_target_protection_container_id   = "${azurerm_recovery_services_protection_container.test2.id}"
+  recovery_replication_policy_id            = "${azurerm_recovery_services_replication_policy.test.id}"
+  name                                      = "mapping-%d"
 }
 
 resource "azurerm_virtual_network" "test1" {
-  name = "net-%d"
+  name                = "net-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  address_space = [ "192.168.1.0/24" ]
-  location = "${azurerm_recovery_services_fabric.test1.location}"
+  address_space       = ["192.168.1.0/24"]
+  location            = "${azurerm_recovery_services_fabric.test1.location}"
 }
 resource "azurerm_subnet" "test1" {
-  name = "snet-%d"
-  resource_group_name = "${azurerm_resource_group.test.name}"
+  name                 = "snet-%d"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
   virtual_network_name = "${azurerm_virtual_network.test1.name}"
-  address_prefix = "192.168.1.0/24"
+  address_prefix       = "192.168.1.0/24"
 }
 
 
 resource "azurerm_virtual_network" "test2" {
-  name = "net-%d"
+  name                = "net-%d"
   resource_group_name = "${azurerm_resource_group.test2.name}"
-  address_space = [ "192.168.2.0/24" ]
-  location = "${azurerm_recovery_services_fabric.test2.location}"
+  address_space       = ["192.168.2.0/24"]
+  location            = "${azurerm_recovery_services_fabric.test2.location}"
 }
 
 resource "azurerm_recovery_network_mapping" "test" {
-  resource_group_name = "${azurerm_resource_group.test2.name}"
-  recovery_vault_name = "${azurerm_recovery_services_vault.test.name}"
-  name = "mapping-%d"
+  resource_group_name         = "${azurerm_resource_group.test2.name}"
+  recovery_vault_name         = "${azurerm_recovery_services_vault.test.name}"
+  name                        = "mapping-%d"
   source_recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}"
   target_recovery_fabric_name = "${azurerm_recovery_services_fabric.test2.name}"
-  source_network_id = "${azurerm_virtual_network.test1.id}"
-  target_network_id = "${azurerm_virtual_network.test2.id}"
+  source_network_id           = "${azurerm_virtual_network.test1.id}"
+  target_network_id           = "${azurerm_virtual_network.test2.id}"
 }
 
 resource "azurerm_network_interface" "test" {
-  name = "vm-%d"
-  location = "${azurerm_resource_group.test.location}"
+  name                = "vm-%d"
+  location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
 
   ip_configuration {
-    name = "vm-%d"
-    subnet_id = "${azurerm_subnet.test1.id}"
+    name                          = "vm-%d"
+    subnet_id                     = "${azurerm_subnet.test1.id}"
     private_ip_address_allocation = "Dynamic"
   }
 }
 
 resource "azurerm_virtual_machine" "test" {
-  name = "vm-%d"
-  location = "${azurerm_resource_group.test.location}"
+  name                = "vm-%d"
+  location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
 
   vm_size = "Standard_B1s"
 
   storage_image_reference {
     publisher = "OpenLogic"
-    offer = "CentOS"
-    sku = "7.5"
-    version = "latest"
+    offer     = "CentOS"
+    sku       = "7.5"
+    version   = "latest"
   }
 
   storage_os_disk {
-    name = "disk-%d"
-    os_type = "Linux"
-    caching = "ReadWrite"
-    create_option = "FromImage"
+    name              = "disk-%d"
+    os_type           = "Linux"
+    caching           = "ReadWrite"
+    create_option     = "FromImage"
     managed_disk_type = "Premium_LRS"
   }
 
   os_profile {
     admin_username = "testadmin"
     admin_password = "Password1234!"
-    computer_name = "vm-%d"
+    computer_name  = "vm-%d"
   }
 
   os_profile_linux_config {
     disable_password_authentication = false
-    
+
   }
   network_interface_ids = ["${azurerm_network_interface.test.id}"]
 }
 
 resource "azurerm_storage_account" "test" {
   name                     = "acct%d"
-  location            = "${azurerm_resource_group.test.location}"
-  resource_group_name = "${azurerm_resource_group.test.name}"
+  location                 = "${azurerm_resource_group.test.location}"
+  resource_group_name      = "${azurerm_resource_group.test.name}"
   account_tier             = "Standard"
   account_replication_type = "LRS"
 }
 
 resource "azurerm_recovery_replicated_vm" "test" {
-  name = "repl-%d"
-  resource_group_name = "${azurerm_resource_group.test2.name}"
-  recovery_vault_name = "${azurerm_recovery_services_vault.test.name}"
-  source_vm_id = "${azurerm_virtual_machine.test.id}"
-  source_recovery_fabric_name = "${azurerm_recovery_services_fabric.test1.name}"
-  recovery_replication_policy_id = "${azurerm_recovery_services_replication_policy.test.id}"
+  name                                      = "repl-%d"
+  resource_group_name                       = "${azurerm_resource_group.test2.name}"
+  recovery_vault_name                       = "${azurerm_recovery_services_vault.test.name}"
+  source_vm_id                              = "${azurerm_virtual_machine.test.id}"
+  source_recovery_fabric_name               = "${azurerm_recovery_services_fabric.test1.name}"
+  recovery_replication_policy_id            = "${azurerm_recovery_services_replication_policy.test.id}"
   source_recovery_protection_container_name = "${azurerm_recovery_services_protection_container.test1.name}"
 
-  target_resource_group_id = "${azurerm_resource_group.test2.id}"
-  target_recovery_fabric_id = "${azurerm_recovery_services_fabric.test2.id}"
+  target_resource_group_id                = "${azurerm_resource_group.test2.id}"
+  target_recovery_fabric_id               = "${azurerm_recovery_services_fabric.test2.id}"
   target_recovery_protection_container_id = "${azurerm_recovery_services_protection_container.test2.id}"
 
   managed_disk {
-    disk_id = "${azurerm_virtual_machine.test.storage_os_disk.0.managed_disk_id}"
+    disk_id                    = "${azurerm_virtual_machine.test.storage_os_disk.0.managed_disk_id}"
     staging_storage_account_id = "${azurerm_storage_account.test.id}"
-    target_resource_group_id = "${azurerm_resource_group.test2.id}"
-    target_disk_type = "Premium_LRS"
-    target_replica_disk_type = "Premium_LRS"
+    target_resource_group_id   = "${azurerm_resource_group.test2.id}"
+    target_disk_type           = "Premium_LRS"
+    target_replica_disk_type   = "Premium_LRS"
   }
   depends_on = ["azurerm_recovery_services_protection_container_mapping.test", "azurerm_recovery_network_mapping.test"]
 }
diff --git a/azurerm/resource_arm_redis_cache_test.go b/azurerm/resource_arm_redis_cache_test.go
index 3a253515270f..0cbc353a212b 100644
--- a/azurerm/resource_arm_redis_cache_test.go
+++ b/azurerm/resource_arm_redis_cache_test.go
@@ -743,10 +743,10 @@ resource "azurerm_redis_cache" "test" {
   enable_non_ssl_port = false
 
   redis_configuration {
-	maxmemory_reserved = 2
-	maxfragmentationmemory_reserved = 2
-    maxmemory_delta    = 2
-    maxmemory_policy   = "allkeys-lru"
+    maxmemory_reserved              = 2
+    maxfragmentationmemory_reserved = 2
+    maxmemory_delta                 = 2
+    maxmemory_policy                = "allkeys-lru"
   }
 }
 `, rInt, location, rInt)
@@ -770,10 +770,10 @@ resource "azurerm_redis_cache" "test" {
   shard_count         = 3
 
   redis_configuration {
-    maxmemory_reserved = 2
-	maxfragmentationmemory_reserved = 2
-    maxmemory_delta    = 2
-    maxmemory_policy   = "allkeys-lru"
+    maxmemory_reserved              = 2
+    maxfragmentationmemory_reserved = 2
+    maxmemory_delta                 = 2
+    maxmemory_policy                = "allkeys-lru"
   }
 }
 `, rInt, location, rInt)
@@ -797,10 +797,10 @@ resource "azurerm_redis_cache" "test" {
   shard_count         = 3
 
   redis_configuration {
-    maxmemory_reserved = 2
-	maxfragmentationmemory_reserved = 2
-    maxmemory_delta    = 2
-    maxmemory_policy   = "allkeys-lru"
+    maxmemory_reserved              = 2
+    maxfragmentationmemory_reserved = 2
+    maxmemory_delta                 = 2
+    maxmemory_policy                = "allkeys-lru"
   }
 }
 `, rInt, location, rInt)
@@ -1113,7 +1113,7 @@ resource "azurerm_redis_cache" "test" {
   enable_non_ssl_port = false
   subnet_id           = "${azurerm_subnet.test.id}"
   redis_configuration {}
-  zones               = ["1"]
+  zones = ["1"]
 }
 `, ri, location, ri, ri)
 }
@@ -1149,8 +1149,8 @@ resource "azurerm_redis_cache" "test" {
   enable_non_ssl_port = false
   subnet_id           = "${azurerm_subnet.test.id}"
   redis_configuration {
-		enable_authentication = false
-	}
+    enable_authentication = false
+  }
 }
 `, ri, location, ri, ri)
 }
diff --git a/azurerm/resource_arm_sql_database_test.go b/azurerm/resource_arm_sql_database_test.go
index 4507873e19fc..374fcf15bffe 100644
--- a/azurerm/resource_arm_sql_database_test.go
+++ b/azurerm/resource_arm_sql_database_test.go
@@ -844,7 +844,7 @@ resource "azurerm_sql_database" "test" {
   edition             = "Premium"
   collation           = "SQL_Latin1_General_CP1_CI_AS"
   max_size_bytes      = "1073741824"
-  read_scale		  = %t
+  read_scale          = %t
 }
 `, rInt, location, rInt, rInt, readScale)
 }
diff --git a/azurerm/resource_arm_sql_failover_group_test.go b/azurerm/resource_arm_sql_failover_group_test.go
index a1e1a22786aa..efb4d929059f 100644
--- a/azurerm/resource_arm_sql_failover_group_test.go
+++ b/azurerm/resource_arm_sql_failover_group_test.go
@@ -220,7 +220,7 @@ resource "azurerm_sql_server" "test_secondary" {
   administrator_login          = "mradministrator"
   administrator_login_password = "thisIsDog11"
 }
-  
+
 resource "azurerm_sql_database" "test" {
   name                             = "acctestdb%[1]d"
   resource_group_name              = "${azurerm_resource_group.test.name}"
@@ -237,7 +237,7 @@ resource "azurerm_sql_failover_group" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   server_name         = "${azurerm_sql_server.test_primary.name}"
   databases           = ["${azurerm_sql_database.test.id}"]
-  
+
   partner_servers {
     id = "${azurerm_sql_server.test_secondary.id}"
   }
@@ -255,20 +255,20 @@ func testAccAzureRMSqlFailoverGroup_requiresImport(rInt int, location, altlocati
 %s
 
 resource "azurerm_sql_failover_group" "import" {
-	name                                = "${azurerm_sql_failover_group.test.name}"
-	resource_group_name                 = "${azurerm_sql_failover_group.test.resource_group_name}"
-	server_name                         = "${azurerm_sql_failover_group.test.server_name}"
-	databases                           = "${azurerm_sql_failover_group.test.databases}"
-
-    partner_servers {
-        id = "${azurerm_sql_failover_group.test.partner_servers.0.id}"
-    }
-
-    read_write_endpoint_failover_policy {
-        mode          = "${azurerm_sql_failover_group.test.read_write_endpoint_failover_policy.0.mode}"
-        grace_minutes = "${azurerm_sql_failover_group.test.read_write_endpoint_failover_policy.0.grace_minutes}"
-    }
+  name                = "${azurerm_sql_failover_group.test.name}"
+  resource_group_name = "${azurerm_sql_failover_group.test.resource_group_name}"
+  server_name         = "${azurerm_sql_failover_group.test.server_name}"
+  databases           = "${azurerm_sql_failover_group.test.databases}"
+
+  partner_servers {
+    id = "${azurerm_sql_failover_group.test.partner_servers.0.id}"
   }
+
+  read_write_endpoint_failover_policy {
+    mode          = "${azurerm_sql_failover_group.test.read_write_endpoint_failover_policy.0.mode}"
+    grace_minutes = "${azurerm_sql_failover_group.test.read_write_endpoint_failover_policy.0.grace_minutes}"
+  }
+}
 `, testAccAzureRMSqlFailoverGroup_basic(rInt, location, altlocation))
 }
 
diff --git a/azurerm/resource_arm_storage_account_test.go b/azurerm/resource_arm_storage_account_test.go
index 34e6ddc7492c..b8ff10bca0a2 100644
--- a/azurerm/resource_arm_storage_account_test.go
+++ b/azurerm/resource_arm_storage_account_test.go
@@ -1579,8 +1579,8 @@ resource "azurerm_storage_account" "testsa" {
       allowed_headers    = ["*"]
       allowed_methods    = ["GET"]
       max_age_in_seconds = "2000000000"
-		}
-		cors_rule {
+    }
+    cors_rule {
       allowed_origins    = ["http://www.test.com"]
       exposed_headers    = ["x-tempo-*"]
       allowed_headers    = ["*"]
diff --git a/azurerm/resource_arm_storage_blob_test.go b/azurerm/resource_arm_storage_blob_test.go
index 29ea162a06e6..e0de9b3cedb7 100644
--- a/azurerm/resource_arm_storage_blob_test.go
+++ b/azurerm/resource_arm_storage_blob_test.go
@@ -1200,7 +1200,7 @@ resource "azurerm_storage_blob" "test" {
   type                   = "block"
   size                   = 5120
   content_type           = "vnd/panda+pops"
-  metadata               = {
+  metadata = {
     hello = "world"
   }
 }
@@ -1220,7 +1220,7 @@ resource "azurerm_storage_blob" "test" {
   type                   = "block"
   size                   = 5120
   content_type           = "vnd/mountain-mover-3000"
-  metadata               = {
+  metadata = {
     hello = "world"
     panda = "pops"
   }
diff --git a/azurerm/resource_arm_storage_management_policy_test.go b/azurerm/resource_arm_storage_management_policy_test.go
index 6739a5644c20..ccf8be2dca4a 100644
--- a/azurerm/resource_arm_storage_management_policy_test.go
+++ b/azurerm/resource_arm_storage_management_policy_test.go
@@ -288,41 +288,41 @@ func testCheckAzureRMStorageAccountManagementPolicyExistsInternal(storageAccount
 func testAccAzureRMStorageManagementPolicy_basic(rInt int, rString string, location string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "testrg" {
-	name     = "acctestAzureRMSA-%d"
-	location = "%s"
+  name     = "acctestAzureRMSA-%d"
+  location = "%s"
 }
 
 resource "azurerm_storage_account" "testsa" {
-	name                = "unlikely23exst2acct%s"
-	resource_group_name = "${azurerm_resource_group.testrg.name}"
+  name                = "unlikely23exst2acct%s"
+  resource_group_name = "${azurerm_resource_group.testrg.name}"
 
-	location                 = "${azurerm_resource_group.testrg.location}"
-	account_tier             = "Standard"
-	account_replication_type = "LRS"
-	account_kind             = "BlobStorage"
+  location                 = "${azurerm_resource_group.testrg.location}"
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+  account_kind             = "BlobStorage"
 }
 
 resource "azurerm_storage_management_policy" "testpolicy" {
-	storage_account_id = "${azurerm_storage_account.testsa.id}"
-
-	rule {
-		name    = "rule1"
-		enabled = true
-		filters {
-			prefix_match = [ "container1/prefix1" ]
-			blob_types   = [ "blockBlob" ]
-		}
-		actions {
-			base_blob {
-				tier_to_cool_after_days_since_modification_greater_than    = 10
-				tier_to_archive_after_days_since_modification_greater_than = 50
-				delete_after_days_since_modification_greater_than          = 100
-			}
-			snapshot {
-				delete_after_days_since_creation_greater_than = 30
-			}
-		}
-	}
+  storage_account_id = "${azurerm_storage_account.testsa.id}"
+
+  rule {
+    name    = "rule1"
+    enabled = true
+    filters {
+      prefix_match = ["container1/prefix1"]
+      blob_types   = ["blockBlob"]
+    }
+    actions {
+      base_blob {
+        tier_to_cool_after_days_since_modification_greater_than    = 10
+        tier_to_archive_after_days_since_modification_greater_than = 50
+        delete_after_days_since_modification_greater_than          = 100
+      }
+      snapshot {
+        delete_after_days_since_creation_greater_than = 30
+      }
+    }
+  }
 }
 `, rInt, location, rString)
 }
@@ -330,59 +330,59 @@ resource "azurerm_storage_management_policy" "testpolicy" {
 func testAccAzureRMStorageManagementPolicy_multipleRule(rInt int, rString string, location string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "testrg" {
-	name     = "acctestAzureRMSA-%d"
-	location = "%s"
+  name     = "acctestAzureRMSA-%d"
+  location = "%s"
 }
 
 resource "azurerm_storage_account" "testsa" {
-	name                = "unlikely23exst2acct%s"
-	resource_group_name = "${azurerm_resource_group.testrg.name}"
+  name                = "unlikely23exst2acct%s"
+  resource_group_name = "${azurerm_resource_group.testrg.name}"
 
-	location                 = "${azurerm_resource_group.testrg.location}"
-	account_tier             = "Standard"
-	account_replication_type = "LRS"
-	account_kind             = "BlobStorage"
+  location                 = "${azurerm_resource_group.testrg.location}"
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+  account_kind             = "BlobStorage"
 }
 
 resource "azurerm_storage_management_policy" "testpolicy" {
-	storage_account_id = "${azurerm_storage_account.testsa.id}"
-
-	rule {
-		name    = "rule1"
-		enabled = true
-		filters {
-			prefix_match = [ "container1/prefix1" ]
-			blob_types   = [ "blockBlob" ]
-		}
-		actions {
-			base_blob {
-				tier_to_cool_after_days_since_modification_greater_than    = 10
-				tier_to_archive_after_days_since_modification_greater_than = 50
-				delete_after_days_since_modification_greater_than          = 100
-			}
-			snapshot {
-				delete_after_days_since_creation_greater_than = 30
-			}
-		}
-	}
-	rule {
-		name    = "rule2"
-		enabled = false
-		filters {
-		  prefix_match = [ "container2/prefix1", "container2/prefix2" ]
-		  blob_types   = [ "blockBlob" ]
-		}
-		actions {
-  		base_blob {
-				tier_to_cool_after_days_since_modification_greater_than    = 11
-				tier_to_archive_after_days_since_modification_greater_than = 51
-				delete_after_days_since_modification_greater_than          = 101
-			}
-			snapshot {
-				delete_after_days_since_creation_greater_than = 31
-			}
-		}
-	}
+  storage_account_id = "${azurerm_storage_account.testsa.id}"
+
+  rule {
+    name    = "rule1"
+    enabled = true
+    filters {
+      prefix_match = ["container1/prefix1"]
+      blob_types   = ["blockBlob"]
+    }
+    actions {
+      base_blob {
+        tier_to_cool_after_days_since_modification_greater_than    = 10
+        tier_to_archive_after_days_since_modification_greater_than = 50
+        delete_after_days_since_modification_greater_than          = 100
+      }
+      snapshot {
+        delete_after_days_since_creation_greater_than = 30
+      }
+    }
+  }
+  rule {
+    name    = "rule2"
+    enabled = false
+    filters {
+      prefix_match = ["container2/prefix1", "container2/prefix2"]
+      blob_types   = ["blockBlob"]
+    }
+    actions {
+      base_blob {
+        tier_to_cool_after_days_since_modification_greater_than    = 11
+        tier_to_archive_after_days_since_modification_greater_than = 51
+        delete_after_days_since_modification_greater_than          = 101
+      }
+      snapshot {
+        delete_after_days_since_creation_greater_than = 31
+      }
+    }
+  }
 }
 `, rInt, location, rString)
 }
@@ -390,59 +390,59 @@ resource "azurerm_storage_management_policy" "testpolicy" {
 func testAccAzureRMStorageManagementPolicy_multipleRuleUpdated(rInt int, rString string, location string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "testrg" {
-	name     = "acctestAzureRMSA-%d"
-	location = "%s"
+  name     = "acctestAzureRMSA-%d"
+  location = "%s"
 }
 
 resource "azurerm_storage_account" "testsa" {
-	name                = "unlikely23exst2acct%s"
-	resource_group_name = "${azurerm_resource_group.testrg.name}"
+  name                = "unlikely23exst2acct%s"
+  resource_group_name = "${azurerm_resource_group.testrg.name}"
 
-	location                 = "${azurerm_resource_group.testrg.location}"
-	account_tier             = "Standard"
-	account_replication_type = "LRS"
-	account_kind             = "BlobStorage"
+  location                 = "${azurerm_resource_group.testrg.location}"
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+  account_kind             = "BlobStorage"
 }
 
 resource "azurerm_storage_management_policy" "testpolicy" {
-	storage_account_id = "${azurerm_storage_account.testsa.id}"
-
-	rule {
-		name    = "rule1"
-		enabled = true
-		filters {
-			prefix_match = [ "container1/prefix1" ]
-			blob_types   = [ "blockBlob" ]
-		}
-		actions {
-			base_blob {
-				tier_to_cool_after_days_since_modification_greater_than    = 10
-				tier_to_archive_after_days_since_modification_greater_than = 50
-				delete_after_days_since_modification_greater_than          = 100
-			}
-			snapshot {
-				delete_after_days_since_creation_greater_than = 30
-			}
-		}
-	}
-	rule {
-		name    = "rule2"
-		enabled = true
-		filters {
-		  prefix_match = [ "container2/prefix1", "container2/prefix2" ]
-		  blob_types   = [ "blockBlob" ]
-		}
-		actions {
-  		base_blob {
-				tier_to_cool_after_days_since_modification_greater_than    = 12
-				tier_to_archive_after_days_since_modification_greater_than = 52
-				delete_after_days_since_modification_greater_than          = 102
-			}
-			snapshot {
-				delete_after_days_since_creation_greater_than = 32
-			}
-		}
-	}
+  storage_account_id = "${azurerm_storage_account.testsa.id}"
+
+  rule {
+    name    = "rule1"
+    enabled = true
+    filters {
+      prefix_match = ["container1/prefix1"]
+      blob_types   = ["blockBlob"]
+    }
+    actions {
+      base_blob {
+        tier_to_cool_after_days_since_modification_greater_than    = 10
+        tier_to_archive_after_days_since_modification_greater_than = 50
+        delete_after_days_since_modification_greater_than          = 100
+      }
+      snapshot {
+        delete_after_days_since_creation_greater_than = 30
+      }
+    }
+  }
+  rule {
+    name    = "rule2"
+    enabled = true
+    filters {
+      prefix_match = ["container2/prefix1", "container2/prefix2"]
+      blob_types   = ["blockBlob"]
+    }
+    actions {
+      base_blob {
+        tier_to_cool_after_days_since_modification_greater_than    = 12
+        tier_to_archive_after_days_since_modification_greater_than = 52
+        delete_after_days_since_modification_greater_than          = 102
+      }
+      snapshot {
+        delete_after_days_since_creation_greater_than = 32
+      }
+    }
+  }
 }
 `, rInt, location, rString)
 }
diff --git a/azurerm/resource_arm_storage_table_entity_test.go b/azurerm/resource_arm_storage_table_entity_test.go
index 4c8bdbcf4346..9cb6c95e4771 100644
--- a/azurerm/resource_arm_storage_table_entity_test.go
+++ b/azurerm/resource_arm_storage_table_entity_test.go
@@ -208,7 +208,7 @@ func testAccAzureRMTableEntity_basic(rInt int, rString string, location string)
 resource "azurerm_storage_table_entity" "test" {
   storage_account_name = "${azurerm_storage_account.test.name}"
   table_name           = "${azurerm_storage_table.test.name}"
-  
+
   partition_key = "test_partition%d"
   row_key       = "test_row%d"
   entity = {
@@ -226,7 +226,7 @@ func testAccAzureRMTableEntity_requiresImport(rInt int, rString string, location
 resource "azurerm_storage_table_entity" "test" {
   storage_account_name = "${azurerm_storage_account.test.name}"
   table_name           = "${azurerm_storage_table.test.name}"
-	
+
   partition_key = "test_partition%d"
   row_key       = "test_row%d"
   entity = {
@@ -244,12 +244,12 @@ func testAccAzureRMTableEntity_updated(rInt int, rString string, location string
 resource "azurerm_storage_table_entity" "test" {
   storage_account_name = "${azurerm_storage_account.test.name}"
   table_name           = "${azurerm_storage_table.test.name}"
-	
+
   partition_key = "test_partition%d"
   row_key       = "test_row%d"
   entity = {
-	Foo = "Bar"
-	Test = "Updated"
+    Foo  = "Bar"
+    Test = "Updated"
   }
 }
 `, template, rInt, rInt)
diff --git a/azurerm/resource_arm_stream_analytics_job_test.go b/azurerm/resource_arm_stream_analytics_job_test.go
index fd14afed5d20..effe169dfc7c 100644
--- a/azurerm/resource_arm_stream_analytics_job_test.go
+++ b/azurerm/resource_arm_stream_analytics_job_test.go
@@ -211,7 +211,7 @@ resource "azurerm_stream_analytics_job" "test" {
   name                                     = "acctestjob-%d"
   resource_group_name                      = "${azurerm_resource_group.test.name}"
   location                                 = "${azurerm_resource_group.test.location}"
-  data_locale							   = "en-GB"
+  data_locale                              = "en-GB"
   compatibility_level                      = "1.0"
   events_late_arrival_max_delay_in_seconds = 60
   events_out_of_order_max_delay_in_seconds = 50
@@ -249,7 +249,7 @@ resource "azurerm_stream_analytics_job" "import" {
   output_error_policy                      = "${azurerm_stream_analytics_job.test.output_error_policy}"
   streaming_units                          = "${azurerm_stream_analytics_job.test.streaming_units}"
   transformation_query                     = "${azurerm_stream_analytics_job.test.transformation_query}"
-  tags				                       = "${azurerm_stream_analytics_job.test.tags}"
+  tags                                     = "${azurerm_stream_analytics_job.test.tags}"
 }
 `, template)
 }
@@ -265,7 +265,7 @@ resource "azurerm_stream_analytics_job" "test" {
   name                                     = "acctestjob-%d"
   resource_group_name                      = "${azurerm_resource_group.test.name}"
   location                                 = "${azurerm_resource_group.test.location}"
-  data_locale							   = "en-GB"
+  data_locale                              = "en-GB"
   compatibility_level                      = "1.1"
   events_late_arrival_max_delay_in_seconds = 10
   events_out_of_order_max_delay_in_seconds = 20
diff --git a/azurerm/resource_arm_traffic_manager_endpoint_test.go b/azurerm/resource_arm_traffic_manager_endpoint_test.go
index 34da95c9dce3..1c3ddcd842c0 100644
--- a/azurerm/resource_arm_traffic_manager_endpoint_test.go
+++ b/azurerm/resource_arm_traffic_manager_endpoint_test.go
@@ -787,7 +787,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternal" {
   }
   subnet {
     first = "11.12.13.14"
-    last = "11.12.13.14"
+    last  = "11.12.13.14"
   }
 }
 
@@ -845,7 +845,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   subnet {
     first = "12.34.56.78"
-    last = "12.34.56.78"
+    last  = "12.34.56.78"
   }
 }
 `, rInt, location, rInt, rInt, rInt, rInt)
@@ -883,7 +883,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternal" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   priority            = 1
   custom_header {
-    name = "header"
+    name  = "header"
     value = "www.bing.com"
   }
 }
@@ -940,7 +940,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" {
   resource_group_name = "${azurerm_resource_group.test.name}"
   priority            = 2
   custom_header {
-    name = "header"
+    name  = "header"
     value = "www.bing.com"
   }
 }
diff --git a/azurerm/resource_arm_virtual_machine_scale_set_test.go b/azurerm/resource_arm_virtual_machine_scale_set_test.go
index 4cc215868298..7343871c3294 100644
--- a/azurerm/resource_arm_virtual_machine_scale_set_test.go
+++ b/azurerm/resource_arm_virtual_machine_scale_set_test.go
@@ -2115,7 +2115,7 @@ resource "azurerm_virtual_machine_scale_set" "test" {
   upgrade_policy_mode = "Manual"
 
   tags = {
-	state  = "create"
+    state = "create"
   }
 
   sku {
@@ -2211,7 +2211,7 @@ resource "azurerm_virtual_machine_scale_set" "test" {
   upgrade_policy_mode = "Manual"
 
   tags = {
-	state  = "update"
+    state = "update"
   }
 
   sku {
@@ -2307,7 +2307,7 @@ resource "azurerm_virtual_machine_scale_set" "test" {
   upgrade_policy_mode = "Manual"
 
   tags = {
-	state  = "update"
+    state = "update"
   }
 
   sku {
@@ -2323,9 +2323,9 @@ resource "azurerm_virtual_machine_scale_set" "test" {
   }
 
   network_profile {
-    name    = "TestNetworkProfile-%[1]d"
-    primary = true
-	ip_forwarding = true
+    name          = "TestNetworkProfile-%[1]d"
+    primary       = true
+    ip_forwarding = true
 
     ip_configuration {
       name      = "TestIPConfiguration"
@@ -2404,7 +2404,7 @@ resource "azurerm_virtual_machine_scale_set" "test" {
   upgrade_policy_mode = "Manual"
 
   tags = {
-	state  = "create"
+    state = "create"
   }
 
   sku {
diff --git a/azurerm/resource_arm_virtual_machine_test.go b/azurerm/resource_arm_virtual_machine_test.go
index 299ac3539d8d..e8bc9ece1d6f 100644
--- a/azurerm/resource_arm_virtual_machine_test.go
+++ b/azurerm/resource_arm_virtual_machine_test.go
@@ -627,7 +627,7 @@ resource "azurerm_storage_container" "test" {
 }
 
 resource "azurerm_proximity_placement_group" "test" {
-	name 								= "accPPG-%[1]d"
+  name                = "accPPG-%[1]d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
 }
diff --git a/azurerm/resource_arm_windows_virtual_machine_scale_set_disk_data_test.go b/azurerm/resource_arm_windows_virtual_machine_scale_set_disk_data_test.go
index 4e0eb23dfeb2..e695c2a47cd2 100644
--- a/azurerm/resource_arm_windows_virtual_machine_scale_set_disk_data_test.go
+++ b/azurerm/resource_arm_windows_virtual_machine_scale_set_disk_data_test.go
@@ -776,10 +776,10 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   data_disk {
-    storage_account_type = "Premium_LRS"
-    caching              = "None"
-    disk_size_gb         = 10
-    lun                  = 10
+    storage_account_type      = "Premium_LRS"
+    caching                   = "None"
+    disk_size_gb              = 10
+    lun                       = 10
     write_accelerator_enabled = true
   }
 
diff --git a/azurerm/resource_arm_windows_virtual_machine_scale_set_identity_test.go b/azurerm/resource_arm_windows_virtual_machine_scale_set_identity_test.go
index b03691e96962..69107a1ec2ae 100644
--- a/azurerm/resource_arm_windows_virtual_machine_scale_set_identity_test.go
+++ b/azurerm/resource_arm_windows_virtual_machine_scale_set_identity_test.go
@@ -340,7 +340,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   identity {
-    type         = "UserAssigned"
+    type = "UserAssigned"
     identity_ids = [
       azurerm_user_assigned_identity.test.id,
     ]
@@ -399,7 +399,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   identity {
-    type         = "UserAssigned"
+    type = "UserAssigned"
     identity_ids = [
       azurerm_user_assigned_identity.test.id,
       azurerm_user_assigned_identity.other.id,
@@ -453,7 +453,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   identity {
-    type         = "SystemAssigned, UserAssigned"
+    type = "SystemAssigned, UserAssigned"
     identity_ids = [
       azurerm_user_assigned_identity.test.id,
     ]
diff --git a/azurerm/resource_arm_windows_virtual_machine_scale_set_images_test.go b/azurerm/resource_arm_windows_virtual_machine_scale_set_images_test.go
index f68c0b63b315..06d3ff8cf2bb 100644
--- a/azurerm/resource_arm_windows_virtual_machine_scale_set_images_test.go
+++ b/azurerm/resource_arm_windows_virtual_machine_scale_set_images_test.go
@@ -375,17 +375,17 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
     primary = true
 
     ip_configuration {
-	  name      = "internal"
-	  primary   = true
-	  subnet_id = azurerm_subnet.test.id
-	  load_balancer_backend_address_pool_ids = [ azurerm_lb_backend_address_pool.test.id ]
-	  load_balancer_inbound_nat_rules_ids = [ azurerm_lb_nat_pool.test.id ]
+      name                                   = "internal"
+      primary                                = true
+      subnet_id                              = azurerm_subnet.test.id
+      load_balancer_backend_address_pool_ids = [azurerm_lb_backend_address_pool.test.id]
+      load_balancer_inbound_nat_rules_ids    = [azurerm_lb_nat_pool.test.id]
     }
   }
 
   automatic_os_upgrade_policy {
-	disable_automatic_rollback  = true
-	enable_automatic_os_upgrade = true
+    disable_automatic_rollback  = true
+    enable_automatic_os_upgrade = true
   }
 
   rolling_upgrade_policy {
@@ -450,7 +450,7 @@ resource "azurerm_virtual_machine" "source" {
   name                  = "source"
   location              = azurerm_resource_group.test.location
   resource_group_name   = azurerm_resource_group.test.name
-  network_interface_ids = [ azurerm_network_interface.source.id ]
+  network_interface_ids = [azurerm_network_interface.source.id]
   vm_size               = "Standard_F2"
 
   storage_image_reference {
@@ -511,7 +511,7 @@ resource "azurerm_image" "second" {
     caching  = "None"
   }
 
-  depends_on = [ "azurerm_image.first" ]
+  depends_on = ["azurerm_image.first"]
 }
 `, template)
 }
@@ -596,13 +596,13 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_imagesManualUpdateExternalRoll(
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                = local.vm_name
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  sku                 = "Standard_F2"
-  instances           = 1
-  admin_username      = "adminuser"
-  admin_password      = "P@ssword1234!"
+  name                                          = local.vm_name
+  resource_group_name                           = azurerm_resource_group.test.name
+  location                                      = azurerm_resource_group.test.location
+  sku                                           = "Standard_F2"
+  instances                                     = 1
+  admin_username                                = "adminuser"
+  admin_password                                = "P@ssword1234!"
   terraform_should_roll_instances_when_required = false
 
   source_image_reference {
@@ -720,11 +720,11 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
     primary = true
 
     ip_configuration {
-      name      = "internal"
-      primary   = true
-      subnet_id = azurerm_subnet.test.id
-      load_balancer_backend_address_pool_ids = [ azurerm_lb_backend_address_pool.test.id ]
-      load_balancer_inbound_nat_rules_ids = [ azurerm_lb_nat_pool.test.id ]
+      name                                   = "internal"
+      primary                                = true
+      subnet_id                              = azurerm_subnet.test.id
+      load_balancer_backend_address_pool_ids = [azurerm_lb_backend_address_pool.test.id]
+      load_balancer_inbound_nat_rules_ids    = [azurerm_lb_nat_pool.test.id]
     }
   }
 
@@ -789,7 +789,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
     publisher = "plesk"
   }
 
-  depends_on = [ "azurerm_marketplace_agreement.test" ]
+  depends_on = ["azurerm_marketplace_agreement.test"]
 }
 `, template)
 }
diff --git a/azurerm/resource_arm_windows_virtual_machine_scale_set_network_test.go b/azurerm/resource_arm_windows_virtual_machine_scale_set_network_test.go
index e40f8c8d70e5..cdcbf73a0b9e 100644
--- a/azurerm/resource_arm_windows_virtual_machine_scale_set_network_test.go
+++ b/azurerm/resource_arm_windows_virtual_machine_scale_set_network_test.go
@@ -874,8 +874,8 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "example"
-    primary = true
+    name                          = "example"
+    primary                       = true
     enable_accelerated_networking = %t
 
     ip_configuration {
@@ -931,10 +931,10 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
     primary = true
 
     ip_configuration {
-      name      = "internal"
-      primary   = true
-      subnet_id = azurerm_subnet.other.id
-      application_gateway_backend_address_pool_ids = [ azurerm_application_gateway.test.backend_address_pool.0.id ]
+      name                                         = "internal"
+      primary                                      = true
+      subnet_id                                    = azurerm_subnet.other.id
+      application_gateway_backend_address_pool_ids = [azurerm_application_gateway.test.backend_address_pool.0.id]
     }
   }
 }
@@ -978,10 +978,10 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
     primary = true
 
     ip_configuration {
-      name      = "internal"
-      primary   = true
-      subnet_id = azurerm_subnet.test.id
-      application_security_group_ids = [ azurerm_application_security_group.test.id ]
+      name                           = "internal"
+      primary                        = true
+      subnet_id                      = azurerm_subnet.test.id
+      application_security_group_ids = [azurerm_application_security_group.test.id]
     }
   }
 }
@@ -1071,8 +1071,8 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "example"
-    primary = true
+    name        = "example"
+    primary     = true
     dns_servers = ["8.8.8.8"]
 
     ip_configuration {
@@ -1112,8 +1112,8 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "example"
-    primary = true
+    name        = "example"
+    primary     = true
     dns_servers = ["1.1.1.1", "8.8.8.8"]
 
     ip_configuration {
@@ -1153,8 +1153,8 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "example"
-    primary = true
+    name                 = "example"
+    primary              = true
     enable_ip_forwarding = true
 
     ip_configuration {
@@ -1274,11 +1274,11 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
     primary = true
 
     ip_configuration {
-      name      = "internal"
-      primary   = true
-      subnet_id = azurerm_subnet.test.id
-      load_balancer_backend_address_pool_ids = [ azurerm_lb_backend_address_pool.test.id ]
-      load_balancer_inbound_nat_rules_ids = [ azurerm_lb_nat_pool.test.id ]
+      name                                   = "internal"
+      primary                                = true
+      subnet_id                              = azurerm_subnet.test.id
+      load_balancer_backend_address_pool_ids = [azurerm_lb_backend_address_pool.test.id]
+      load_balancer_inbound_nat_rules_ids    = [azurerm_lb_nat_pool.test.id]
     }
   }
 }
@@ -1414,7 +1414,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "secondary"
+    name = "secondary"
 
     ip_configuration {
       name      = "internal"
@@ -1469,7 +1469,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "secondary"
+    name = "secondary"
 
     ip_configuration {
       name      = "third"
@@ -1513,8 +1513,8 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "primary"
-    primary = true
+    name        = "primary"
+    primary     = true
     dns_servers = ["8.8.8.8"]
 
     ip_configuration {
@@ -1525,7 +1525,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "secondary"
+    name        = "secondary"
     dns_servers = ["1.1.1.1"]
 
     ip_configuration {
@@ -1582,7 +1582,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "secondary"
+    name = "secondary"
 
     ip_configuration {
       name      = "second"
@@ -1633,8 +1633,8 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "example"
-    primary = true
+    name                      = "example"
+    primary                   = true
     network_security_group_id = azurerm_network_security_group.test.id
 
     ip_configuration {
@@ -1686,8 +1686,8 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   network_interface {
-    name    = "example"
-    primary = true
+    name                      = "example"
+    primary                   = true
     network_security_group_id = azurerm_network_security_group.other.id
 
     ip_configuration {
@@ -1873,8 +1873,8 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
       subnet_id = azurerm_subnet.test.id
 
       public_ip_address {
-        name                 = "first"
-        public_ip_prefix_id  = azurerm_public_ip_prefix.test.id
+        name                = "first"
+        public_ip_prefix_id = azurerm_public_ip_prefix.test.id
       }
     }
   }
@@ -1918,7 +1918,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
       subnet_id = azurerm_subnet.test.id
 
       public_ip_address {
-        name                 = "first"
+        name = "first"
 
         ip_tag {
           tag  = "/Sql"
diff --git a/azurerm/resource_arm_windows_virtual_machine_scale_set_other_test.go b/azurerm/resource_arm_windows_virtual_machine_scale_set_other_test.go
index d820fe5fc674..e77dbafd5a44 100644
--- a/azurerm/resource_arm_windows_virtual_machine_scale_set_other_test.go
+++ b/azurerm/resource_arm_windows_virtual_machine_scale_set_other_test.go
@@ -803,13 +803,13 @@ resource "azurerm_storage_account" "test" {
 }
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -855,13 +855,13 @@ resource "azurerm_storage_account" "test" {
 }
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -977,14 +977,14 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverPr
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  overprovision        = true
+  name                                              = local.vm_name
+  resource_group_name                               = azurerm_resource_group.test.name
+  location                                          = azurerm_resource_group.test.location
+  sku                                               = "Standard_F2"
+  instances                                         = 1
+  admin_username                                    = "adminuser"
+  admin_password                                    = "P@ssword1234!"
+  overprovision                                     = true
   do_not_run_extensions_on_overprovisioned_machines = true
 
   source_image_reference {
@@ -1019,13 +1019,13 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_otherEnableAutomaticUpdatesDisa
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                     = local.vm_name
+  resource_group_name      = azurerm_resource_group.test.name
+  location                 = azurerm_resource_group.test.location
+  sku                      = "Standard_F2"
+  instances                = 1
+  admin_username           = "adminuser"
+  admin_password           = "P@ssword1234!"
   enable_automatic_updates = false
 
   source_image_reference {
@@ -1226,13 +1226,13 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_otherSecret(rInt int, location
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -1275,13 +1275,13 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_otherSecretRemoved(rInt int, lo
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -1315,13 +1315,13 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_otherSecretUpdated(rInt int, lo
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -1376,9 +1376,9 @@ resource "azurerm_key_vault" "test" {
   resource_group_name = azurerm_resource_group.test.name
   tenant_id           = data.azurerm_client_config.current.tenant_id
 
-  sku_name = "standard"
+  sku_name                        = "standard"
   enabled_for_template_deployment = true
-  enabled_for_deployment = true
+  enabled_for_deployment          = true
 
   access_policy {
     tenant_id = data.azurerm_client_config.current.tenant_id
@@ -1505,13 +1505,13 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_otherTags(rInt int, location st
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -1549,13 +1549,13 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_otherTagsUpdated(rInt int, loca
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -1594,14 +1594,14 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_otherTimeZone(rInt int, locatio
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  timezone             = "Hawaiian Standard Time"
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  timezone            = "Hawaiian Standard Time"
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -1635,14 +1635,14 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_otherVMAgent(rInt int, location
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  provision_vm_agent              = %t
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  provision_vm_agent  = %t
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
diff --git a/azurerm/resource_arm_windows_virtual_machine_scale_set_scaling_test.go b/azurerm/resource_arm_windows_virtual_machine_scale_set_scaling_test.go
index 25ec16dfd63b..26d43b2b66d9 100644
--- a/azurerm/resource_arm_windows_virtual_machine_scale_set_scaling_test.go
+++ b/azurerm/resource_arm_windows_virtual_machine_scale_set_scaling_test.go
@@ -427,14 +427,14 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_scalingAutoScale(rInt int, loca
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 2
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  overprovision = true
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 2
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  overprovision       = true
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -525,13 +525,13 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_scalingInstanceCount(rInt int,
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = %d
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = %d
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -565,13 +565,13 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_scalingInstanceCountIgnoreUpdat
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F4"
-  instances            = %d
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F4"
+  instances           = %d
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -597,7 +597,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   }
 
   lifecycle {
-    ignore_changes = [ "sku" ]
+    ignore_changes = ["sku"]
   }
 }
 `, template, instanceCount)
@@ -609,14 +609,14 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_scalingOverProvisionDisabled(rI
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 3
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  overprovision        = false
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 3
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  overprovision       = false
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -656,13 +656,13 @@ resource "azurerm_proximity_placement_group" "test" {
 }
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                         = local.vm_name
+  resource_group_name          = azurerm_resource_group.test.name
+  location                     = azurerm_resource_group.test.location
+  sku                          = "Standard_F2"
+  instances                    = 1
+  admin_username               = "adminuser"
+  admin_password               = "P@ssword1234!"
   proximity_placement_group_id = azurerm_proximity_placement_group.test.id
 
   source_image_reference {
@@ -697,14 +697,14 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_scalingSinglePlacementGroupDisa
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  single_placement_group          = false
+  name                   = local.vm_name
+  resource_group_name    = azurerm_resource_group.test.name
+  location               = azurerm_resource_group.test.location
+  sku                    = "Standard_F2"
+  instances              = 1
+  admin_username         = "adminuser"
+  admin_password         = "P@ssword1234!"
+  single_placement_group = false
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -738,13 +738,13 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_scalingUpdateSku(rInt int, loca
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = %q
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = %q
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -778,13 +778,13 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_scalingUpdateSkuIgnoredUpdatedC
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = %q
-  instances            = 5
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = %q
+  instances           = 5
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -822,14 +822,14 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_scalingZonesSingle(rInt int, lo
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 1
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  zones                = [ "1" ]
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  zones               = ["1"]
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -863,14 +863,14 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_scalingZonesMultiple(rInt int,
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 2
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  zones                = [ "1", "2" ]
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 2
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  zones               = ["1", "2"]
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"
@@ -904,15 +904,15 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_scalingZonesBalance(rInt int, l
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                 = local.vm_name
-  resource_group_name  = azurerm_resource_group.test.name
-  location             = azurerm_resource_group.test.location
-  sku                  = "Standard_F2"
-  instances            = 4
-  admin_username       = "adminuser"
-  admin_password       = "P@ssword1234!"
-  zones                = [ "1", "2" ]
-  zone_balance         = true
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 4
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  zones               = ["1", "2"]
+  zone_balance        = true
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"

From fca4090e9bc38553f12c8a37e41fcca5e4305f36 Mon Sep 17 00:00:00 2001
From: kt <kt@katbyte.me>
Date: Fri, 25 Oct 2019 09:34:39 -0700
Subject: [PATCH 2/5] pass 2

---
 ...nux_virtual_machine_scale_set_auth_test.go |  16 +-
 ...irtual_machine_scale_set_disk_data_test.go | 112 +++---
 ..._virtual_machine_scale_set_disk_os_test.go |  80 ++--
 ...virtual_machine_scale_set_identity_test.go |  64 ++--
 ...x_virtual_machine_scale_set_images_test.go |  88 ++---
 ..._virtual_machine_scale_set_network_test.go | 352 +++++++++---------
 ...ux_virtual_machine_scale_set_other_test.go | 220 +++++------
 ..._virtual_machine_scale_set_scaling_test.go | 180 ++++-----
 8 files changed, 556 insertions(+), 556 deletions(-)

diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_auth_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_auth_test.go
index 04e7696d2fd8..b7216f40797c 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_auth_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_auth_test.go
@@ -234,14 +234,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_authPassword(rInt int, location s
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go
index 6022fc809b71..397d73053f8c 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go
@@ -462,14 +462,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskBasic(rInt int, loca
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -511,14 +511,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskCaching(rInt int, lo
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -560,14 +560,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskResize(rInt int, loc
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -609,14 +609,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskMultiple(rInt int, l
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -665,14 +665,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskStorageAccountType(r
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2s_v2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2s_v2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -714,14 +714,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskStorageAccountTypeUl
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_D2s_v3"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_D2s_v3"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -767,14 +767,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksDataDiskWriteAcceleratorEnab
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_M8ms"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_M8ms"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go
index 841041331a34..456682dd28dc 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go
@@ -288,14 +288,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksOSDiskCaching(rInt int, loca
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -330,14 +330,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksOSDiskCustomSize(rInt int, l
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -373,14 +373,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksOSDiskEphemeral(rInt int, lo
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2s_v2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2s_v2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -419,14 +419,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksOSDiskStorageAccountType(rIn
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2s_v2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2s_v2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -461,14 +461,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_disksOSDiskWriteAcceleratorEnable
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_M8ms"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_M8ms"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_identity_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_identity_test.go
index 35fdc0423ad2..24480a3d1c9f 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_identity_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_identity_test.go
@@ -258,14 +258,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_identitySystemAssigned(rInt int,
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -310,14 +310,14 @@ resource "azurerm_user_assigned_identity" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -371,14 +371,14 @@ resource "azurerm_user_assigned_identity" "other" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -427,14 +427,14 @@ resource "azurerm_user_assigned_identity" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_images_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_images_test.go
index c81adf8f22fa..2cec0f95ac55 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_images_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_images_test.go
@@ -346,16 +346,16 @@ resource "azurerm_lb_rule" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
-  health_probe_id                 = azurerm_lb_probe.test.id
-  upgrade_mode                    = "Automatic"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  health_probe_id     = azurerm_lb_probe.test.id
+  upgrade_mode        = "Automatic"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -560,14 +560,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_imagesManualUpdate(rInt int, loca
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -602,14 +602,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_imagesManualUpdateExternalRoll(rI
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                                          = "acctestvmss-%d"
-  resource_group_name                           = azurerm_resource_group.test.name
-  location                                      = azurerm_resource_group.test.location
-  sku                                           = "Standard_F2"
-  instances                                     = 1
-  admin_username                                = "adminuser"
-  admin_password                                = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication               = false
   terraform_should_roll_instances_when_required = false
 
@@ -701,16 +701,16 @@ resource "azurerm_lb_rule" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
-  health_probe_id                 = azurerm_lb_probe.test.id
-  upgrade_mode                    = "Rolling"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  health_probe_id     = azurerm_lb_probe.test.id
+  upgrade_mode        = "Rolling"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -762,14 +762,14 @@ resource "azurerm_marketplace_agreement" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_network_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_network_test.go
index 54271fd3f4a1..ee3ed1f819ae 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_network_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_network_test.go
@@ -853,14 +853,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkAcceleratedNetworking(rInt
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F4"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F4"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -903,14 +903,14 @@ resource "azurerm_subnet" "other" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -952,14 +952,14 @@ resource "azurerm_application_security_group" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1007,14 +1007,14 @@ resource "azurerm_application_security_group" "other" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1053,14 +1053,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkDNSServers(rInt int, locat
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1096,14 +1096,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkDNSServersUpdated(rInt int
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1139,14 +1139,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkIPForwarding(rInt int, loc
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1182,14 +1182,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkIPv6(rInt int, location st
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1260,14 +1260,14 @@ resource "azurerm_lb_nat_pool" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1304,14 +1304,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkMultipleIPConfigurations(r
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1351,14 +1351,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkMultipleIPConfigurationsIP
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_D2s_v3"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_D2s_v3"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1399,14 +1399,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkMultipleNICs(rInt int, loc
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1451,14 +1451,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkMultipleNICsMultipleIPConf
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1513,14 +1513,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkMultipleNICsWithDifferentD
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1567,14 +1567,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkMultipleNICsMultiplePublic
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1637,14 +1637,14 @@ resource "azurerm_network_security_group" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1692,14 +1692,14 @@ resource "azurerm_network_security_group" "other" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1735,14 +1735,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkPrivate(rInt int, location
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1777,14 +1777,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkPublicIP(rInt int, locatio
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1824,14 +1824,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkPublicIPDomainNameLabel(rI
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1878,14 +1878,14 @@ resource "azurerm_public_ip_prefix" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1925,14 +1925,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_networkPublicIPTags(rInt int, loc
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_other_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_other_test.go
index 9495870487a4..3e6f489c2ecc 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_other_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_other_test.go
@@ -574,14 +574,14 @@ resource "azurerm_storage_account" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -628,14 +628,14 @@ resource "azurerm_storage_account" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -670,15 +670,15 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherComputerNamePrefix(rInt int,
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
-  computer_name_prefix            = "morty"
- 
+  name                 = "acctestvmss-%d"
+  resource_group_name  = azurerm_resource_group.test.name
+  location             = azurerm_resource_group.test.location
+  sku                  = "Standard_F2"
+  instances            = 1
+  admin_username       = "adminuser"
+  admin_password       = "P@ssword1234!"
+  computer_name_prefix = "morty"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -756,14 +756,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverProv
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                                              = "acctestvmss-%d"
-  resource_group_name                               = azurerm_resource_group.test.name
-  location                                          = azurerm_resource_group.test.location
-  sku                                               = "Standard_F2"
-  instances                                         = 1
-  admin_username                                    = "adminuser"
-  admin_password                                    = "P@ssword1234!"
-  overprovision                                     = true
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  overprovision       = true
 
   disable_password_authentication                   = false
   do_not_run_extensions_on_overprovisioned_machines = true
@@ -800,16 +800,16 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherPriorityLow(rInt int, locati
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
-  eviction_policy                 = %q
-  priority                        = "Low"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  eviction_policy     = %q
+  priority            = "Low"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -844,16 +844,16 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherPriorityLowMaxBidPrice(rInt
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
-  eviction_policy                 = "Delete"
-  priority                        = "Low"
-  max_bid_price                   = %q
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  eviction_policy     = "Delete"
+  priority            = "Low"
+  max_bid_price       = %q
 
   disable_password_authentication = false
 
@@ -889,15 +889,15 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherPriorityRegular(rInt int, lo
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
-  priority                        = "Regular"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  priority            = "Regular"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -974,14 +974,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherSecret(rInt int, location st
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1024,14 +1024,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherSecretRemoved(rInt int, loca
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1066,14 +1066,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherSecretUpdated(rInt int, loca
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1256,14 +1256,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherTags(rInt int, location stri
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1302,14 +1302,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherTagsUpdated(rInt int, locati
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -1349,14 +1349,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_otherVMAgent(rInt int, location s
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
   provision_vm_agent              = %t
 
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_scaling_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_scaling_test.go
index ad089c588e79..3b3967680010 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_scaling_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_scaling_test.go
@@ -427,16 +427,16 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingAutoScale(rInt int, locati
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 2
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
-  overprovision                   = true
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 2
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  overprovision       = true
 
-disable_password_authentication = false
+  disable_password_authentication = false
 
   source_image_reference {
     publisher = "Canonical"
@@ -527,14 +527,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingInstanceCount(rInt int, lo
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = %d
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = %d
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -569,14 +569,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingInstanceCountIgnoreUpdated
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F4"
-  instances                       = %d
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F4"
+  instances           = %d
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -615,14 +615,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingOverProvisionDisabled(rInt
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 3
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
-  overprovision                   = false
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 3
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  overprovision       = false
 
   disable_password_authentication = false
 
@@ -664,14 +664,14 @@ resource "azurerm_proximity_placement_group" "test" {
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
   proximity_placement_group_id    = azurerm_proximity_placement_group.test.id
 
@@ -707,14 +707,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingSinglePlacementGroupDisabl
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
   single_placement_group          = false
 
@@ -750,14 +750,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingUpdateSku(rInt int, locati
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = %q
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = %q
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -792,14 +792,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingUpdateSkuIgnoredUpdatedCou
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = %q
-  instances                       = 5
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
- 
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = %q
+  instances           = 5
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+
   disable_password_authentication = false
 
   source_image_reference {
@@ -838,14 +838,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingZonesSingle(rInt int, loca
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 1
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
-  zones                           = ["1"]
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  zones               = ["1"]
 
   disable_password_authentication = false
 
@@ -881,14 +881,14 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingZonesMultiple(rInt int, lo
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 2
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
-  zones                           = ["1", "2"]
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 2
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  zones               = ["1", "2"]
 
   disable_password_authentication = false
 
@@ -924,15 +924,15 @@ func testAccAzureRMLinuxVirtualMachineScaleSet_scalingZonesBalance(rInt int, loc
 %s
 
 resource "azurerm_linux_virtual_machine_scale_set" "test" {
-  name                            = "acctestvmss-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  sku                             = "Standard_F2"
-  instances                       = 4
-  admin_username                  = "adminuser"
-  admin_password                  = "P@ssword1234!"
-  zones                           = ["1", "2"]
-  zone_balance                    = true
+  name                = "acctestvmss-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 4
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  zones               = ["1", "2"]
+  zone_balance        = true
 
   disable_password_authentication = false
 

From d1cbfaaf0a4b0963471d7d9479f0fedc9723f0ea Mon Sep 17 00:00:00 2001
From: kt <kt@katbyte.me>
Date: Fri, 25 Oct 2019 09:53:51 -0700
Subject: [PATCH 3/5] pass 3

---
 azurerm/data_source_mssql_elasticpool_test.go | 82 +++++++++----------
 .../resource_arm_batch_application_test.go    |  2 +-
 azurerm/resource_arm_cosmosdb_account_test.go | 20 ++---
 ...rce_arm_front_door_firewall_policy_test.go | 52 ++++++------
 ...resource_arm_key_vault_certificate_test.go |  3 +-
 azurerm/resource_arm_key_vault_test.go        |  2 +-
 ...ux_virtual_machine_scale_set_other_test.go |  2 +-
 ...ource_arm_scheduler_job_collection_test.go |  2 +-
 ...ws_virtual_machine_scale_set_other_test.go |  3 +-
 9 files changed, 85 insertions(+), 83 deletions(-)

diff --git a/azurerm/data_source_mssql_elasticpool_test.go b/azurerm/data_source_mssql_elasticpool_test.go
index ca5cf05631e2..67e840ae4576 100644
--- a/azurerm/data_source_mssql_elasticpool_test.go
+++ b/azurerm/data_source_mssql_elasticpool_test.go
@@ -39,45 +39,45 @@ func TestAccDataSourceAzureRMMsSqlElasticPool_basic(t *testing.T) {
 
 func testAccDataSourceAzureRMMsSqlElasticPool_basic(rInt int, location string) string {
 	return fmt.Sprintf(`
-    resource "azurerm_resource_group" "test" {
-      name     = "acctestRG-%[1]d"
-      location = "%s"
-    }
-    
-    resource "azurerm_sql_server" "test" {
-      name                         = "acctest%[1]d"
-      resource_group_name          = "${azurerm_resource_group.test.name}"
-      location                     = "${azurerm_resource_group.test.location}"
-      version                      = "12.0"
-      administrator_login          = "4dm1n157r470r"
-      administrator_login_password = "4-v3ry-53cr37-p455w0rd"
-    }
-    
-    resource "azurerm_mssql_elasticpool" "test" {
-      name                = "acctest-pool-dtu-%[1]d"
-      resource_group_name = "${azurerm_resource_group.test.name}"
-      location            = "${azurerm_resource_group.test.location}"
-      server_name         = "${azurerm_sql_server.test.name}"
-      max_size_gb         = 50
-      zone_redundant      = false
-      
-      sku {
-        name     = "GP_Gen5"
-        tier     = "GeneralPurpose"
-        capacity = 4
-        family   = "Gen5"
-      }
-    
-      per_database_settings {
-        min_capacity = 0
-        max_capacity = 4
-      }
-    }
-    
-    data "azurerm_mssql_elasticpool" "test" {
-      name                = "${azurerm_mssql_elasticpool.test.name}"
-      resource_group_name = "${azurerm_resource_group.test.name}"
-      server_name         = "${azurerm_sql_server.test.name}"
-    }
-  `, rInt, location)
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%[1]d"
+  location = "%s"
+}
+
+resource "azurerm_sql_server" "test" {
+  name                         = "acctest%[1]d"
+  resource_group_name          = "${azurerm_resource_group.test.name}"
+  location                     = "${azurerm_resource_group.test.location}"
+  version                      = "12.0"
+  administrator_login          = "4dm1n157r470r"
+  administrator_login_password = "4-v3ry-53cr37-p455w0rd"
+}
+
+resource "azurerm_mssql_elasticpool" "test" {
+  name                = "acctest-pool-dtu-%[1]d"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  location            = "${azurerm_resource_group.test.location}"
+  server_name         = "${azurerm_sql_server.test.name}"
+  max_size_gb         = 50
+  zone_redundant      = false
+
+  sku {
+    name     = "GP_Gen5"
+    tier     = "GeneralPurpose"
+    capacity = 4
+    family   = "Gen5"
+  }
+
+  per_database_settings {
+    min_capacity = 0
+    max_capacity = 4
+  }
+}
+
+data "azurerm_mssql_elasticpool" "test" {
+  name                = "${azurerm_mssql_elasticpool.test.name}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  server_name         = "${azurerm_sql_server.test.name}"
+}
+`, rInt, location)
 }
diff --git a/azurerm/resource_arm_batch_application_test.go b/azurerm/resource_arm_batch_application_test.go
index 8b44da19ef52..03b9bd23d2a2 100644
--- a/azurerm/resource_arm_batch_application_test.go
+++ b/azurerm/resource_arm_batch_application_test.go
@@ -144,7 +144,7 @@ resource "azurerm_batch_application" "test" {
   name                = "acctestbatchapp-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   account_name        = "${azurerm_batch_account.test.name}"
-  	%s
+        	%s
 }
 `, rInt, location, rString, rString, rInt, displayName)
 }
diff --git a/azurerm/resource_arm_cosmosdb_account_test.go b/azurerm/resource_arm_cosmosdb_account_test.go
index bcb2fb1a7f50..9301dd66b38e 100644
--- a/azurerm/resource_arm_cosmosdb_account_test.go
+++ b/azurerm/resource_arm_cosmosdb_account_test.go
@@ -736,7 +736,7 @@ resource "azurerm_cosmosdb_account" "test" {
   consistency_policy {
     consistency_level = "%s"
 
-    %s
+            %s
   }
 
   geo_location {
@@ -744,7 +744,7 @@ resource "azurerm_cosmosdb_account" "test" {
     failover_priority = 0
   }
 
-  %s
+      %s
 }
 `, rInt, location, rInt, consistency, consistencyOptions, additional)
 }
@@ -763,7 +763,7 @@ resource "azurerm_cosmosdb_account" "import" {
   consistency_policy {
     consistency_level = "%s"
 
-    %s
+            %s
   }
 
   geo_location {
@@ -771,7 +771,7 @@ resource "azurerm_cosmosdb_account" "import" {
     failover_priority = 0
   }
 
-  %s
+      %s
 }
 `, template, consistency, consistencyOptions, additional)
 }
@@ -861,7 +861,7 @@ func testAccAzureRMCosmosDBAccount_geoReplicated(rInt int, location string, altL
             failover_priority = 1
         }
 
-    `, altLocation))
+  `, altLocation))
 }
 
 func testAccAzureRMCosmosDBAccount_multiMaster(rInt int, location string, altLocation string) string {
@@ -878,7 +878,7 @@ func testAccAzureRMCosmosDBAccount_multiMaster(rInt int, location string, altLoc
             failover_priority = 1
         }
 
-    `, altLocation))
+  `, altLocation))
 }
 
 func testAccAzureRMCosmosDBAccount_geoReplicated_customId(rInt int, location string, altLocation string) string {
@@ -894,7 +894,7 @@ func testAccAzureRMCosmosDBAccount_geoReplicated_customId(rInt int, location str
             failover_priority = 1
         }
 
-    `, rInt, altLocation))
+  `, rInt, altLocation))
 }
 
 func testAccAzureRMCosmosDBAccount_geoReplicated_customConsistencyLevel(rInt int, location string, altLocation string, cLevel documentdb.DefaultConsistencyLevel) string {
@@ -905,7 +905,7 @@ func testAccAzureRMCosmosDBAccount_geoReplicated_customConsistencyLevel(rInt int
             failover_priority = 1
         }
 
-    `, rInt, altLocation))
+  `, rInt, altLocation))
 }
 
 func testAccAzureRMCosmosDBAccount_complete(rInt int, location string, altLocation string) string {
@@ -922,7 +922,7 @@ func testAccAzureRMCosmosDBAccount_complete(rInt int, location string, altLocati
             location          = "%s"
             failover_priority = 1
         }
-    `, rInt, altLocation))
+  `, rInt, altLocation))
 }
 
 func testAccAzureRMCosmosDBAccount_emptyIpFilter(rInt int, location string, altLocation string) string {
@@ -940,7 +940,7 @@ func testAccAzureRMCosmosDBAccount_emptyIpFilter(rInt int, location string, altL
             location          = "%s"
             failover_priority = 1
         }
-    `, rInt, altLocation))
+  `, rInt, altLocation))
 }
 
 func testAccAzureRMCosmosDBAccount_virtualNetworkFilter(rInt int, location string) string {
diff --git a/azurerm/resource_arm_front_door_firewall_policy_test.go b/azurerm/resource_arm_front_door_firewall_policy_test.go
index 3b91974268e4..ea1005ac9a6b 100644
--- a/azurerm/resource_arm_front_door_firewall_policy_test.go
+++ b/azurerm/resource_arm_front_door_firewall_policy_test.go
@@ -237,31 +237,31 @@ resource "azurerm_frontdoor_firewall_policy" "import" {
 
 func testAccAzureRMFrontDoorFirewallPolicy_updateTemplate() string {
 	return fmt.Sprintf(`
-  custom_rule {
-    name                           = "Rule2"
-    enabled                        = true
-    priority                       = 2
-    rate_limit_duration_in_minutes = 1
-    rate_limit_threshold           = 10
-    type                           = "MatchRule"
-    action                         = "Block"
-
-    match_condition {
-      match_variable     = "RemoteAddr"
-      operator           = "IPMatch"
-      negation_condition = false
-      match_values       = ["192.168.1.0/24"]
-    }
+custom_rule {
+  name                           = "Rule2"
+  enabled                        = true
+  priority                       = 2
+  rate_limit_duration_in_minutes = 1
+  rate_limit_threshold           = 10
+  type                           = "MatchRule"
+  action                         = "Block"
+
+  match_condition {
+    match_variable     = "RemoteAddr"
+    operator           = "IPMatch"
+    negation_condition = false
+    match_values       = ["192.168.1.0/24"]
+  }
 
-    match_condition {
-      match_variable     = "RequestHeader"
-      selector           = "UserAgent"
-      operator           = "Contains"
-      negation_condition = false
-      match_values       = ["windows"]
-      transforms         = ["Lowercase", "Trim"]
-    }
+  match_condition {
+    match_variable     = "RequestHeader"
+    selector           = "UserAgent"
+    operator           = "Contains"
+    negation_condition = false
+    match_values       = ["windows"]
+    transforms         = ["Lowercase", "Trim"]
   }
+}
 `)
 }
 
@@ -298,7 +298,7 @@ resource "azurerm_frontdoor_firewall_policy" "test" {
     }
   }
 
-  %[2]s
+        %[2]s
 
   managed_rule {
     type    = "DefaultRuleSet"
@@ -316,8 +316,8 @@ resource "azurerm_frontdoor_firewall_policy" "test" {
   }
 
   managed_rule {
-    type      = "BotProtection"
-    version   = "preview-0.1"
+    type    = "BotProtection"
+    version = "preview-0.1"
   }
 }
 `, rInt, sTemplate, location)
diff --git a/azurerm/resource_arm_key_vault_certificate_test.go b/azurerm/resource_arm_key_vault_certificate_test.go
index 309b3fbc4f11..d09d6a1ffb8e 100644
--- a/azurerm/resource_arm_key_vault_certificate_test.go
+++ b/azurerm/resource_arm_key_vault_certificate_test.go
@@ -543,7 +543,8 @@ resource "azurerm_key_vault_certificate" "import" {
       content_type = "application/x-pkcs12"
     }
   }
-}`, template)
+}
+`, template)
 }
 
 func testAccAzureRMKeyVaultCertificate_basicGenerate(rString string, location string) string {
diff --git a/azurerm/resource_arm_key_vault_test.go b/azurerm/resource_arm_key_vault_test.go
index 716b3e4e4ae0..7061d85e2968 100644
--- a/azurerm/resource_arm_key_vault_test.go
+++ b/azurerm/resource_arm_key_vault_test.go
@@ -878,7 +878,7 @@ resource "azurerm_key_vault" "test" {
   tenant_id           = "${data.azurerm_client_config.current.tenant_id}"
 
   sku_name = "premium"
-  %s
+        %s
 }
 
 %s
diff --git a/azurerm/resource_arm_linux_virtual_machine_scale_set_other_test.go b/azurerm/resource_arm_linux_virtual_machine_scale_set_other_test.go
index 3e6f489c2ecc..e3c7d8f9ee29 100644
--- a/azurerm/resource_arm_linux_virtual_machine_scale_set_other_test.go
+++ b/azurerm/resource_arm_linux_virtual_machine_scale_set_other_test.go
@@ -938,7 +938,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "import" {
   sku                 = azurerm_linux_virtual_machine_scale_set.test.sku
   instances           = azurerm_linux_virtual_machine_scale_set.test.instances
   admin_username      = azurerm_linux_virtual_machine_scale_set.test.admin_username
-  admin_password      = "azurerm_linux_virtual_machine_scale_set.test.admin_password
+  admin_password      = azurerm_linux_virtual_machine_scale_set.test.admin_password
 
   disable_password_authentication = false
 
diff --git a/azurerm/resource_arm_scheduler_job_collection_test.go b/azurerm/resource_arm_scheduler_job_collection_test.go
index 769c88056086..6ac3e784a226 100644
--- a/azurerm/resource_arm_scheduler_job_collection_test.go
+++ b/azurerm/resource_arm_scheduler_job_collection_test.go
@@ -174,7 +174,7 @@ resource "azurerm_scheduler_job_collection" "import" {
   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_windows_virtual_machine_scale_set_other_test.go b/azurerm/resource_arm_windows_virtual_machine_scale_set_other_test.go
index e77dbafd5a44..42625ddd85c7 100644
--- a/azurerm/resource_arm_windows_virtual_machine_scale_set_other_test.go
+++ b/azurerm/resource_arm_windows_virtual_machine_scale_set_other_test.go
@@ -985,6 +985,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
   admin_username                                    = "adminuser"
   admin_password                                    = "P@ssword1234!"
   overprovision                                     = true
+
   do_not_run_extensions_on_overprovisioned_machines = true
 
   source_image_reference {
@@ -1192,7 +1193,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "import" {
   sku                 = azurerm_windows_virtual_machine_scale_set.test.sku
   instances           = azurerm_windows_virtual_machine_scale_set.test.instances
   admin_username      = azurerm_windows_virtual_machine_scale_set.test.admin_username
-  admin_password      = "azurerm_windows_virtual_machine_scale_set.test.admin_password
+  admin_password      = azurerm_windows_virtual_machine_scale_set.test.admin_password
 
   source_image_reference {
     publisher = "MicrosoftWindowsServer"

From 3ff83d4e14a1473811b3d90678710f0f0f23c136 Mon Sep 17 00:00:00 2001
From: kt <kt@katbyte.me>
Date: Fri, 25 Oct 2019 10:10:42 -0700
Subject: [PATCH 4/5] pass 4

---
 azurerm/data_source_arm_data_factory_test.go     |  2 +-
 .../data_source_express_route_circuit_test.go    |  2 +-
 ...a_source_network_ddos_protection_plan_test.go |  2 +-
 azurerm/resource_arm_batch_application_test.go   |  2 +-
 azurerm/resource_arm_cosmosdb_account_test.go    |  8 ++++----
 ...source_arm_front_door_firewall_policy_test.go |  2 +-
 .../resource_arm_key_vault_certificate_test.go   |  2 +-
 azurerm/resource_arm_key_vault_test.go           |  2 +-
 azurerm/resource_arm_mssql_elasticpool_test.go   |  2 +-
 ...resource_arm_scheduler_job_collection_test.go |  2 +-
 ...ndows_virtual_machine_scale_set_other_test.go | 16 ++++++++--------
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/azurerm/data_source_arm_data_factory_test.go b/azurerm/data_source_arm_data_factory_test.go
index 1d6109df4fcb..90945cf372cf 100644
--- a/azurerm/data_source_arm_data_factory_test.go
+++ b/azurerm/data_source_arm_data_factory_test.go
@@ -31,7 +31,7 @@ func TestAccAzureRMDataFactoryDataSource_basic(t *testing.T) {
 func testAccAzureRMDataFactoryDataSource_basic(rInt int, location string) string {
 	config := testAccAzureRMDataFactory_basic(rInt, location)
 	return fmt.Sprintf(`
-    %s
+%s
 
 data "azurerm_data_factory" "test" {
   name                = "${azurerm_data_factory.test.name}"
diff --git a/azurerm/data_source_express_route_circuit_test.go b/azurerm/data_source_express_route_circuit_test.go
index 7189b8ad99a1..c7ded4d6c03a 100644
--- a/azurerm/data_source_express_route_circuit_test.go
+++ b/azurerm/data_source_express_route_circuit_test.go
@@ -37,7 +37,7 @@ func testAccDataSourceAzureRMExpressRoute_basic(rInt int, location string) strin
 	config := testAccAzureRMExpressRouteCircuit_basicMeteredConfig(rInt, location)
 
 	return fmt.Sprintf(`
-	%s
+%s
 
 data "azurerm_express_route_circuit" test {
   resource_group_name = "${azurerm_resource_group.test.name}"
diff --git a/azurerm/data_source_network_ddos_protection_plan_test.go b/azurerm/data_source_network_ddos_protection_plan_test.go
index 207056a1ac74..d84277d2815b 100644
--- a/azurerm/data_source_network_ddos_protection_plan_test.go
+++ b/azurerm/data_source_network_ddos_protection_plan_test.go
@@ -31,7 +31,7 @@ func testAccAzureRMNetworkDDoSProtectionPlanDataSource_basic(t *testing.T) {
 
 func testAccAzureRMNetworkDDoSProtectionPlanDataSource_basicConfig(rInt int, location string) string {
 	return fmt.Sprintf(`
-	%s
+%s
 
 data "azurerm_network_ddos_protection_plan" "test" {
   name                = "${azurerm_network_ddos_protection_plan.test.name}"
diff --git a/azurerm/resource_arm_batch_application_test.go b/azurerm/resource_arm_batch_application_test.go
index 03b9bd23d2a2..155df2685e10 100644
--- a/azurerm/resource_arm_batch_application_test.go
+++ b/azurerm/resource_arm_batch_application_test.go
@@ -144,7 +144,7 @@ resource "azurerm_batch_application" "test" {
   name                = "acctestbatchapp-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   account_name        = "${azurerm_batch_account.test.name}"
-        	%s
+  %s
 }
 `, rInt, location, rString, rString, rInt, displayName)
 }
diff --git a/azurerm/resource_arm_cosmosdb_account_test.go b/azurerm/resource_arm_cosmosdb_account_test.go
index 9301dd66b38e..697f4ce8fee9 100644
--- a/azurerm/resource_arm_cosmosdb_account_test.go
+++ b/azurerm/resource_arm_cosmosdb_account_test.go
@@ -736,7 +736,7 @@ resource "azurerm_cosmosdb_account" "test" {
   consistency_policy {
     consistency_level = "%s"
 
-            %s
+    %s
   }
 
   geo_location {
@@ -744,7 +744,7 @@ resource "azurerm_cosmosdb_account" "test" {
     failover_priority = 0
   }
 
-      %s
+  %s
 }
 `, rInt, location, rInt, consistency, consistencyOptions, additional)
 }
@@ -763,7 +763,7 @@ resource "azurerm_cosmosdb_account" "import" {
   consistency_policy {
     consistency_level = "%s"
 
-            %s
+    %s
   }
 
   geo_location {
@@ -771,7 +771,7 @@ resource "azurerm_cosmosdb_account" "import" {
     failover_priority = 0
   }
 
-      %s
+  %s
 }
 `, template, consistency, consistencyOptions, additional)
 }
diff --git a/azurerm/resource_arm_front_door_firewall_policy_test.go b/azurerm/resource_arm_front_door_firewall_policy_test.go
index ea1005ac9a6b..0510cf657cc4 100644
--- a/azurerm/resource_arm_front_door_firewall_policy_test.go
+++ b/azurerm/resource_arm_front_door_firewall_policy_test.go
@@ -298,7 +298,7 @@ resource "azurerm_frontdoor_firewall_policy" "test" {
     }
   }
 
-        %[2]s
+  %[2]s
 
   managed_rule {
     type    = "DefaultRuleSet"
diff --git a/azurerm/resource_arm_key_vault_certificate_test.go b/azurerm/resource_arm_key_vault_certificate_test.go
index d09d6a1ffb8e..f99689860bc2 100644
--- a/azurerm/resource_arm_key_vault_certificate_test.go
+++ b/azurerm/resource_arm_key_vault_certificate_test.go
@@ -519,7 +519,7 @@ func testAccAzureRMKeyVaultCertificate_requiresImport(rString string, location s
 %s
 
 resource "azurerm_key_vault_certificate" "import" {
-  name     = "${azurerm_key_vault_certificate.test.name}"
+  name         = "${azurerm_key_vault_certificate.test.name}"
   key_vault_id = "${azurerm_key_vault.test.id}"
 
   certificate {
diff --git a/azurerm/resource_arm_key_vault_test.go b/azurerm/resource_arm_key_vault_test.go
index 7061d85e2968..716b3e4e4ae0 100644
--- a/azurerm/resource_arm_key_vault_test.go
+++ b/azurerm/resource_arm_key_vault_test.go
@@ -878,7 +878,7 @@ resource "azurerm_key_vault" "test" {
   tenant_id           = "${data.azurerm_client_config.current.tenant_id}"
 
   sku_name = "premium"
-        %s
+  %s
 }
 
 %s
diff --git a/azurerm/resource_arm_mssql_elasticpool_test.go b/azurerm/resource_arm_mssql_elasticpool_test.go
index cb5635827bd0..246e4d9bd911 100644
--- a/azurerm/resource_arm_mssql_elasticpool_test.go
+++ b/azurerm/resource_arm_mssql_elasticpool_test.go
@@ -509,7 +509,7 @@ resource "azurerm_mssql_elasticpool" "test" {
   server_name         = "${azurerm_sql_server.test.name}"
   max_size_gb         = %.7[6]f
   zone_redundant      = %[9]t
-  
+
   sku {
     name     = "%[3]s"
     tier     = "%[4]s"
diff --git a/azurerm/resource_arm_scheduler_job_collection_test.go b/azurerm/resource_arm_scheduler_job_collection_test.go
index 6ac3e784a226..9a6d9947b161 100644
--- a/azurerm/resource_arm_scheduler_job_collection_test.go
+++ b/azurerm/resource_arm_scheduler_job_collection_test.go
@@ -174,7 +174,7 @@ resource "azurerm_scheduler_job_collection" "import" {
   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_windows_virtual_machine_scale_set_other_test.go b/azurerm/resource_arm_windows_virtual_machine_scale_set_other_test.go
index 42625ddd85c7..f8419ab96e28 100644
--- a/azurerm/resource_arm_windows_virtual_machine_scale_set_other_test.go
+++ b/azurerm/resource_arm_windows_virtual_machine_scale_set_other_test.go
@@ -977,14 +977,14 @@ func testAccAzureRMWindowsVirtualMachineScaleSet_otherDoNotRunExtensionsOnOverPr
 %s
 
 resource "azurerm_windows_virtual_machine_scale_set" "test" {
-  name                                              = local.vm_name
-  resource_group_name                               = azurerm_resource_group.test.name
-  location                                          = azurerm_resource_group.test.location
-  sku                                               = "Standard_F2"
-  instances                                         = 1
-  admin_username                                    = "adminuser"
-  admin_password                                    = "P@ssword1234!"
-  overprovision                                     = true
+  name                = local.vm_name
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku                 = "Standard_F2"
+  instances           = 1
+  admin_username      = "adminuser"
+  admin_password      = "P@ssword1234!"
+  overprovision       = true
 
   do_not_run_extensions_on_overprovisioned_machines = true
 

From 9131d352f57ea7e2dfd7544d773ac1de82b837fb Mon Sep 17 00:00:00 2001
From: kt <kt@katbyte.me>
Date: Fri, 25 Oct 2019 10:34:09 -0700
Subject: [PATCH 5/5] pass 5

---
 .../resource_arm_policy_set_definition_test.go    |  1 +
 ..._private_dns_zone_virtual_network_link_test.go |  6 +++---
 .../resource_arm_servicebus_subscription_test.go  |  1 +
 azurerm/resource_arm_stream_analytics_job_test.go | 15 ++++++++-------
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/azurerm/resource_arm_policy_set_definition_test.go b/azurerm/resource_arm_policy_set_definition_test.go
index 6695b5711660..9e0a31938c38 100644
--- a/azurerm/resource_arm_policy_set_definition_test.go
+++ b/azurerm/resource_arm_policy_set_definition_test.go
@@ -156,6 +156,7 @@ POLICY_DEFINITIONS
 
 func testAzureRMPolicySetDefinition_requiresImport(ri int) string {
 	return fmt.Sprintf(`
+
 %s 
 
 resource "azurerm_policy_set_definition" "import" {
diff --git a/azurerm/resource_arm_private_dns_zone_virtual_network_link_test.go b/azurerm/resource_arm_private_dns_zone_virtual_network_link_test.go
index f828b69902aa..628cd01789cc 100644
--- a/azurerm/resource_arm_private_dns_zone_virtual_network_link_test.go
+++ b/azurerm/resource_arm_private_dns_zone_virtual_network_link_test.go
@@ -201,10 +201,10 @@ func testAccAzureRMPrivateDnsZoneVirtualNetworkLink_requiresImport(rInt int, loc
 %s
 
 resource "azurerm_private_dns_zone_virtual_network_link" "import" {
-  name                	= "${azurerm_private_dns_zone_virtual_network_link.test.name}
+  name                  = "${azurerm_private_dns_zone_virtual_network_link.test.name}"
   private_dns_zone_name = "${azurerm_private_dns_zone_virtual_network_link.test.private_dns_zone_name}"
-  virtual_network_id 	= "${azurerm_private_dns_zone_virtual_network_link.test.virtual_network_id}"
-  resource_group_name 	= "${azurerm_private_dns_zone_virtual_network_link.test.resource_group_name}"
+  virtual_network_id    = "${azurerm_private_dns_zone_virtual_network_link.test.virtual_network_id}"
+  resource_group_name   = "${azurerm_private_dns_zone_virtual_network_link.test.resource_group_name}"
 }
 `, template)
 }
diff --git a/azurerm/resource_arm_servicebus_subscription_test.go b/azurerm/resource_arm_servicebus_subscription_test.go
index bf86f4067053..a96e1d334f3a 100644
--- a/azurerm/resource_arm_servicebus_subscription_test.go
+++ b/azurerm/resource_arm_servicebus_subscription_test.go
@@ -287,6 +287,7 @@ func testAccAzureRMServiceBusSubscription_basic(rInt int, location string) strin
 
 func testAccAzureRMServiceBusSubscription_requiresImport(rInt int, location string) string {
 	return fmt.Sprintf(`
+
 %s 
 
 resource "azurerm_servicebus_subscription" "import" {
diff --git a/azurerm/resource_arm_stream_analytics_job_test.go b/azurerm/resource_arm_stream_analytics_job_test.go
index effe169dfc7c..a18a80d4e1f3 100644
--- a/azurerm/resource_arm_stream_analytics_job_test.go
+++ b/azurerm/resource_arm_stream_analytics_job_test.go
@@ -183,21 +183,22 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_stream_analytics_job" "test" {
-  name                                     = "acctestjob-%d"
-  resource_group_name                      = "${azurerm_resource_group.test.name}"
-  location                                 = "${azurerm_resource_group.test.location}"
-  streaming_units                          = 3
+  name                = "acctestjob-%d"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  location            = "${azurerm_resource_group.test.location}"
+  streaming_units     = 3
 
   tags = {
     environment = "Test"
-  }  
-  
+  }
+
   transformation_query = <<QUERY
     SELECT *
     INTO [YourOutputAlias]
     FROM [YourInputAlias]
 QUERY
-}`, rInt, location, rInt)
+}
+`, rInt, location, rInt)
 }
 
 func testAccAzureRMStreamAnalyticsJob_complete(rInt int, location string) string {