test configs: cleaning up deprecated fields

azurerm/internal/services/authorization/tests/resource_arm_role_assignment_test.go

@@ -349,7 +349,7 @@ data "azurerm_role_definition" "test" {
 resource "azurerm_role_assignment" "test" {
   scope              = "${data.azurerm_subscription.primary.id}"
   role_definition_id = "${data.azurerm_subscription.primary.id}${data.azurerm_role_definition.test.id}"
-  principal_id       = "${data.azurerm_client_config.test.service_principal_object_id}"
+  principal_id       = "${data.azurerm_client_config.test.object_id}"
 }
 `
 }
@@ -364,7 +364,7 @@ resource "azurerm_role_assignment" "test" {
   name                 = "%s"
   scope                = "${data.azurerm_subscription.primary.id}"
   role_definition_name = "Log Analytics Reader"
-  principal_id         = "${data.azurerm_client_config.test.service_principal_object_id}"
+  principal_id         = "${data.azurerm_client_config.test.object_id}"
 }
 `, id)
 }
@@ -392,7 +392,7 @@ resource "azurerm_role_assignment" "test" {
   name                 = "%s"
   scope                = "${data.azurerm_subscription.primary.id}"
   role_definition_name = "Virtual Machine User Login"
-  principal_id         = "${data.azurerm_client_config.test.service_principal_object_id}"
+  principal_id         = "${data.azurerm_client_config.test.object_id}"
 }
 `, id)
 }
@@ -411,7 +411,7 @@ resource "azurerm_role_assignment" "test" {
   name               = "%s"
   scope              = "${data.azurerm_subscription.primary.id}"
   role_definition_id = "${data.azurerm_subscription.primary.id}${data.azurerm_role_definition.test.id}"
-  principal_id       = "${data.azurerm_client_config.test.service_principal_object_id}"
+  principal_id       = "${data.azurerm_client_config.test.object_id}"
 }
 `, id)
 }
@@ -442,7 +442,7 @@ resource "azurerm_role_assignment" "test" {
   name               = "%s"
   scope              = "${data.azurerm_subscription.primary.id}"
   role_definition_id = "${azurerm_role_definition.test.id}"
-  principal_id       = "${data.azurerm_client_config.test.service_principal_object_id}"
+  principal_id       = "${data.azurerm_client_config.test.object_id}"
 }
 `, roleDefinitionId, rInt, roleAssignmentId)
 }
@@ -524,7 +524,7 @@ resource "azurerm_management_group" "test" {
 resource "azurerm_role_assignment" "test" {
   scope              = "${azurerm_management_group.test.id}"
   role_definition_id = "${data.azurerm_role_definition.test.id}"
-  principal_id       = "${data.azurerm_client_config.test.service_principal_object_id}"
+  principal_id       = "${data.azurerm_client_config.test.object_id}"
 }
 `, groupId)
 }

azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go

@@ -1067,7 +1067,6 @@ resource "azurerm_storage_account" "test" {
 
 resource "azurerm_storage_container" "test" {
   name                  = "vhds"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
   storage_account_name  = "${azurerm_storage_account.test.name}"
   container_access_type = "blob"
 }

azurerm/internal/services/bot/tests/resource_arm_bot_channels_registration_test.go

@@ -185,7 +185,7 @@ resource "azurerm_bot_channels_registration" "test" {
   location            = "global"
   resource_group_name = "${azurerm_resource_group.test.name}"
   sku                 = "F0"
-  microsoft_app_id    = "${data.azurerm_client_config.current.service_principal_application_id}"
+  microsoft_app_id    = "${data.azurerm_client_config.current.client_id}"
 
   tags = {
     environment = "production"
@@ -208,7 +208,7 @@ resource "azurerm_bot_channels_registration" "test" {
   location            = "global"
   resource_group_name = "${azurerm_resource_group.test.name}"
   sku                 = "F0"
-  microsoft_app_id    = "${data.azurerm_client_config.current.service_principal_application_id}"
+  microsoft_app_id    = "${data.azurerm_client_config.current.client_id}"
 
   tags = {
     environment = "production"
@@ -243,7 +243,7 @@ resource "azurerm_bot_channels_registration" "test" {
   name                = "acctestdf%d"
   location            = "global"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  microsoft_app_id    = "${data.azurerm_client_config.current.service_principal_application_id}"
+  microsoft_app_id    = "${data.azurerm_client_config.current.client_id}"
   sku                 = "F0"
 
   endpoint                              = "https://example.com"

azurerm/internal/services/bot/tests/resource_arm_bot_web_app_test.go

@@ -146,7 +146,7 @@ resource "azurerm_bot_web_app" "test" {
   location            = "global"
   resource_group_name = "${azurerm_resource_group.test.name}"
   sku                 = "F0"
-  microsoft_app_id    = "${data.azurerm_client_config.current.service_principal_application_id}"
+  microsoft_app_id    = "${data.azurerm_client_config.current.client_id}"
 
   tags = {
     environment = "production"
@@ -169,7 +169,7 @@ resource "azurerm_bot_web_app" "test" {
   location            = "global"
   resource_group_name = "${azurerm_resource_group.test.name}"
   sku                 = "F0"
-  microsoft_app_id    = "${data.azurerm_client_config.current.service_principal_application_id}"
+  microsoft_app_id    = "${data.azurerm_client_config.current.client_id}"
 
   tags = {
     environment = "production"
@@ -204,7 +204,7 @@ resource "azurerm_bot_web_app" "test" {
   name                = "acctestdf%d"
   location            = "global"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  microsoft_app_id    = "${data.azurerm_client_config.current.service_principal_application_id}"
+  microsoft_app_id    = "${data.azurerm_client_config.current.client_id}"
   sku                 = "F0"
 
   endpoint                              = "https://example.com"

azurerm/internal/services/compute/tests/data_source_snapshot_test.go

@@ -106,7 +106,7 @@ resource "azurerm_key_vault" "test" {
 
   access_policy {
     tenant_id = "${data.azurerm_client_config.current.tenant_id}"
-    object_id = "${data.azurerm_client_config.current.service_principal_object_id}"
+    object_id = "${data.azurerm_client_config.current.object_id}"
 
     key_permissions = [
       "create",

azurerm/internal/services/compute/tests/linux_virtual_machine_resource_disk_os_test.go

@@ -480,7 +480,7 @@ resource "azurerm_key_vault" "test" {
 resource "azurerm_key_vault_access_policy" "service-principal" {
   key_vault_id = azurerm_key_vault.test.id
   tenant_id    = data.azurerm_client_config.current.tenant_id
-  object_id    = data.azurerm_client_config.current.service_principal_object_id
+  object_id    = data.azurerm_client_config.current.object_id
 
   key_permissions = [
     "create",

azurerm/internal/services/compute/tests/linux_virtual_machine_resource_other_test.go

@@ -781,7 +781,7 @@ resource "azurerm_key_vault" "test" {
 
   access_policy {
     tenant_id = data.azurerm_client_config.current.tenant_id
-    object_id = data.azurerm_client_config.current.service_principal_object_id
+    object_id = data.azurerm_client_config.current.object_id
 
     certificate_permissions = [
       "create",

azurerm/internal/services/compute/tests/resource_arm_disk_encryption_set_test.go

@@ -236,7 +236,7 @@ resource "azurerm_key_vault" "test" {
 
   access_policy {
     tenant_id = data.azurerm_client_config.current.tenant_id
-    object_id = data.azurerm_client_config.current.service_principal_object_id
+    object_id = data.azurerm_client_config.current.object_id
 
     key_permissions = [
       "create",

azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_data_test.go

@@ -456,7 +456,7 @@ resource "azurerm_key_vault" "test" {
 resource "azurerm_key_vault_access_policy" "service-principal" {
   key_vault_id = azurerm_key_vault.test.id
   tenant_id    = data.azurerm_client_config.current.tenant_id
-  object_id    = data.azurerm_client_config.current.service_principal_object_id
+  object_id    = data.azurerm_client_config.current.object_id
 
   key_permissions = [
     "create",

azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_disk_os_test.go

@@ -326,7 +326,7 @@ resource "azurerm_key_vault" "test" {
 resource "azurerm_key_vault_access_policy" "service-principal" {
   key_vault_id = azurerm_key_vault.test.id
   tenant_id    = data.azurerm_client_config.current.tenant_id
-  object_id    = data.azurerm_client_config.current.service_principal_object_id
+  object_id    = data.azurerm_client_config.current.object_id
 
   key_permissions = [
     "create",

azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_other_test.go

@@ -978,7 +978,7 @@ resource "azurerm_key_vault" "test" {
 
   access_policy {
     tenant_id = data.azurerm_client_config.current.tenant_id
-    object_id = data.azurerm_client_config.current.service_principal_object_id
+    object_id = data.azurerm_client_config.current.object_id
 
     certificate_permissions = [
       "create",

azurerm/internal/services/compute/tests/resource_arm_managed_disk_test.go

@@ -697,7 +697,7 @@ resource "azurerm_key_vault" "test" {
 
   access_policy {
     tenant_id = "${data.azurerm_client_config.current.tenant_id}"
-    object_id = "${data.azurerm_client_config.current.service_principal_object_id}"
+    object_id = "${data.azurerm_client_config.current.object_id}"
 
     key_permissions = [
       "create",
@@ -867,7 +867,7 @@ resource "azurerm_key_vault" "test" {
 resource "azurerm_key_vault_access_policy" "service-principal" {
   key_vault_id = azurerm_key_vault.test.id
   tenant_id    = data.azurerm_client_config.current.tenant_id
-  object_id    = data.azurerm_client_config.current.service_principal_object_id
+  object_id    = data.azurerm_client_config.current.object_id
 
   key_permissions = [
     "create",

azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go

@@ -359,7 +359,7 @@ resource "azurerm_key_vault" "test" {
 
   access_policy {
     tenant_id = "${data.azurerm_client_config.current.tenant_id}"
-    object_id = "${data.azurerm_client_config.current.service_principal_object_id}"
+    object_id = "${data.azurerm_client_config.current.object_id}"
 
     key_permissions = [
       "create",

azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go

@@ -820,7 +820,7 @@ resource "azurerm_key_vault" "test" {
 
   access_policy {
     tenant_id = "${data.azurerm_client_config.current.tenant_id}"
-    object_id = "${data.azurerm_client_config.current.service_principal_object_id}"
+    object_id = "${data.azurerm_client_config.current.object_id}"
 
     key_permissions = [
       "backup",

azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_disk_data_test.go

@@ -503,7 +503,7 @@ resource "azurerm_key_vault" "test" {
 resource "azurerm_key_vault_access_policy" "service-principal" {
   key_vault_id = azurerm_key_vault.test.id
   tenant_id    = data.azurerm_client_config.current.tenant_id
-  object_id    = data.azurerm_client_config.current.service_principal_object_id
+  object_id    = data.azurerm_client_config.current.object_id
 
   key_permissions = [
     "create",

azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_disk_os_test.go

@@ -326,7 +326,7 @@ resource "azurerm_key_vault" "test" {
 resource "azurerm_key_vault_access_policy" "service-principal" {
   key_vault_id = azurerm_key_vault.test.id
   tenant_id    = data.azurerm_client_config.current.tenant_id
-  object_id    = data.azurerm_client_config.current.service_principal_object_id
+  object_id    = data.azurerm_client_config.current.object_id
 
   key_permissions = [
     "create",

azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_other_test.go

@@ -1169,7 +1169,7 @@ resource "azurerm_key_vault" "test" {
 
   access_policy {
     tenant_id = data.azurerm_client_config.current.tenant_id
-    object_id = data.azurerm_client_config.current.service_principal_object_id
+    object_id = data.azurerm_client_config.current.object_id
 
     certificate_permissions = [
       "create",
@@ -1519,7 +1519,7 @@ resource "azurerm_key_vault" "test" {
 
   access_policy {
     tenant_id = data.azurerm_client_config.current.tenant_id
-    object_id = data.azurerm_client_config.current.service_principal_object_id
+    object_id = data.azurerm_client_config.current.object_id
 
     key_permissions = [
       "backup",

azurerm/internal/services/compute/tests/windows_virtual_machine_resource_disk_os_test.go

@@ -503,7 +503,7 @@ resource "azurerm_key_vault" "test" {
 resource "azurerm_key_vault_access_policy" "service-principal" {
   key_vault_id = azurerm_key_vault.test.id
   tenant_id    = data.azurerm_client_config.current.tenant_id
-  object_id    = data.azurerm_client_config.current.service_principal_object_id
+  object_id    = data.azurerm_client_config.current.object_id
 
   key_permissions = [
     "create",

azurerm/internal/services/compute/tests/windows_virtual_machine_resource_other_test.go

@@ -1122,7 +1122,7 @@ resource "azurerm_key_vault" "test" {
 
   access_policy {
     tenant_id = data.azurerm_client_config.current.tenant_id
-    object_id = data.azurerm_client_config.current.service_principal_object_id
+    object_id = data.azurerm_client_config.current.object_id
 
     certificate_permissions = [
       "create",
@@ -1509,7 +1509,7 @@ resource "azurerm_key_vault" "test" {
 
   access_policy {
     tenant_id = data.azurerm_client_config.current.tenant_id
-    object_id = data.azurerm_client_config.current.service_principal_object_id
+    object_id = data.azurerm_client_config.current.object_id
 
     key_permissions = [
       "backup",

azurerm/internal/services/eventgrid/tests/resource_arm_eventgrid_event_subscription_test.go

@@ -202,7 +202,6 @@ resource "azurerm_storage_queue" "test" {
 
 resource "azurerm_storage_container" "test" {
   name                  = "vhds"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
   storage_account_name  = "${azurerm_storage_account.test.name}"
   container_access_type = "private"
 }
@@ -263,21 +262,18 @@ resource "azurerm_storage_account" "test" {
 
 resource "azurerm_storage_queue" "test" {
   name                 = "mysamplequeue-%d"
-  resource_group_name  = "${azurerm_resource_group.test.name}"
   storage_account_name = "${azurerm_storage_account.test.name}"
 }
 
 resource "azurerm_storage_container" "test" {
   name                  = "vhds"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
   storage_account_name  = "${azurerm_storage_account.test.name}"
   container_access_type = "private"
 }
 
 resource "azurerm_storage_blob" "test" {
   name = "herpderp1.vhd"
 
-  resource_group_name    = "${azurerm_resource_group.test.name}"
   storage_account_name   = "${azurerm_storage_account.test.name}"
   storage_container_name = "${azurerm_storage_container.test.name}"
 

azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_hbase_cluster_test.go

@@ -606,7 +606,6 @@ resource "azurerm_storage_account" "test" {
 
 resource "azurerm_storage_container" "test" {
   name                  = "acctest"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
   storage_account_name  = "${azurerm_storage_account.test.name}"
   container_access_type = "private"
 }

azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_interactive_query_cluster_test.go

@@ -608,7 +608,6 @@ resource "azurerm_storage_account" "test" {
 
 resource "azurerm_storage_container" "test" {
   name                  = "acctest"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
   storage_account_name  = "${azurerm_storage_account.test.name}"
   container_access_type = "private"
 }

azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_kafka_cluster_test.go

@@ -617,7 +617,6 @@ resource "azurerm_storage_account" "test" {
 
 resource "azurerm_storage_container" "test" {
   name                  = "acctest"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
   storage_account_name  = "${azurerm_storage_account.test.name}"
   container_access_type = "private"
 }

azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_ml_services_cluster_test.go

@@ -564,7 +564,6 @@ resource "azurerm_storage_account" "test" {
 
 resource "azurerm_storage_container" "test" {
   name                  = "acctest"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
   storage_account_name  = "${azurerm_storage_account.test.name}"
   container_access_type = "private"
 }

azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_rserver_cluster_test.go

@@ -564,7 +564,6 @@ resource "azurerm_storage_account" "test" {
 
 resource "azurerm_storage_container" "test" {
   name                  = "acctest"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
   storage_account_name  = "${azurerm_storage_account.test.name}"
   container_access_type = "private"
 }

azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_spark_cluster_test.go

@@ -608,7 +608,6 @@ resource "azurerm_storage_account" "test" {
 
 resource "azurerm_storage_container" "test" {
   name                  = "acctest"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
   storage_account_name  = "${azurerm_storage_account.test.name}"
   container_access_type = "private"
 }

azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_storm_cluster_test.go

@@ -528,7 +528,6 @@ resource "azurerm_storage_account" "test" {
 
 resource "azurerm_storage_container" "test" {
   name                  = "acctest"
-  resource_group_name   = "${azurerm_resource_group.test.name}"
   storage_account_name  = "${azurerm_storage_account.test.name}"
   container_access_type = "private"
 }

azurerm/internal/services/healthcare/tests/resource_arm_healthcare_service_test.go

@@ -148,7 +148,7 @@ resource "azurerm_healthcare_service" "test" {
   resource_group_name = "${azurerm_resource_group.test.name}"
 
   access_policy_object_ids = [
-    "${data.azurerm_client_config.current.service_principal_object_id}",
+    "${data.azurerm_client_config.current.object_id}",
   ]
 }
 `, data.RandomInteger, location, data.RandomIntOfLength(17)) //name can only be 24 chars long
@@ -165,7 +165,7 @@ resource "azurerm_healthcare_service" "import" {
   resource_group_name = azurerm_healthcare_service.test.resource_group_name
 
   access_policy_object_ids = [
-    "${data.azurerm_client_config.current.service_principal_object_id}",
+    "${data.azurerm_client_config.current.object_id}",
   ]
 }
 `, template)
@@ -194,7 +194,7 @@ resource "azurerm_healthcare_service" "test" {
   }
 
   access_policy_object_ids = [
-    "${data.azurerm_client_config.current.service_principal_object_id}",
+    "${data.azurerm_client_config.current.object_id}",
   ]
 
   authentication_configuration {