Revert "move managed disk attachment from storage to disks."

This reverts commit 8b58cfe.
hashicorp · Jan 7, 2022 · 014f95a · 014f95a
1 parent 8b58cfe
commit 014f95a
Show file tree

Hide file tree

Showing 12 changed files with 364 additions and 335 deletions.
diff --git a/internal/services/disks/disk_pool_managed_disk_attachment_resource.go b/internal/services/disks/disk_pool_managed_disk_attachment_resource.go
diff --git a/internal/services/disks/registration.go b/internal/services/disks/registration.go
@@ -20,7 +20,6 @@ func (r Registration) DataSources() []sdk.DataSource {
 func (r Registration) Resources() []sdk.Resource {
 	resources := []sdk.Resource{
 		DiskPoolResource{},
-		DiskPoolManagedDiskAttachmentResource{},
 	}
 
 	if !features.ThreePointOh() {

diff --git a/internal/services/mssql/mssql_server_transparent_data_encryption_resource_test.go b/internal/services/mssql/mssql_server_transparent_data_encryption_resource_test.go
@@ -89,73 +89,75 @@ func (MsSqlServerTransparentDataEncryptionResource) Exists(ctx context.Context,
 }
 
 func (r MsSqlServerTransparentDataEncryptionResource) keyVault(data acceptance.TestData) string {
-	return fmt.Sprintf(`
+	return fmt.Sprintf(
+		`
 %s
 
 resource "azurerm_key_vault" "test" {
-  name                        = "acctestsqlserver%[2]s"
-  location                    = azurerm_resource_group.test.location
-  resource_group_name         = azurerm_resource_group.test.name
-  enabled_for_disk_encryption = true
-  tenant_id                   = data.azurerm_client_config.current.tenant_id
-  soft_delete_retention_days  = 7
-  purge_protection_enabled    = false
-
-  sku_name = "standard"
-
-  access_policy {
-    tenant_id = data.azurerm_client_config.current.tenant_id
-    object_id = data.azurerm_client_config.current.object_id
-
-    key_permissions = [
-      "Get", "List", "Create", "Delete", "Update", "Purge",
-    ]
-  }
-
-  access_policy {
-    tenant_id = azurerm_mssql_server.test.identity[0].tenant_id
-    object_id = azurerm_mssql_server.test.identity[0].principal_id
+	name                        = "acctestsqlserver%[2]s"
+	location                    = azurerm_resource_group.test.location
+	resource_group_name         = azurerm_resource_group.test.name
+	enabled_for_disk_encryption = true
+	tenant_id                   = data.azurerm_client_config.current.tenant_id
+	soft_delete_retention_days  = 7
+	purge_protection_enabled    = false
+
+	sku_name = "standard"
+
+	access_policy {
+	  tenant_id    = data.azurerm_client_config.current.tenant_id
+	  object_id    = data.azurerm_client_config.current.object_id
+  
+	  key_permissions = [
+		"Get",  "List", "Create", "Delete", "Update", "Purge", 
+	  ]
+	}
 
-    key_permissions = [
-      "Get", "WrapKey", "UnwrapKey", "List", "Create",
-    ]
+	access_policy {
+	tenant_id = azurerm_mssql_server.test.identity[0].tenant_id
+	object_id = azurerm_mssql_server.test.identity[0].principal_id
+  
+	key_permissions = [
+		"Get", "WrapKey", "UnwrapKey", "List", "Create", 
+	  ]
+	}
   }
-}
 
-resource "azurerm_key_vault_key" "generated" {
-  name         = "keyVault"
-  key_vault_id = azurerm_key_vault.test.id
-  key_type     = "RSA"
-  key_size     = 2048
-
-  key_opts = [
-    "decrypt",
-    "encrypt",
-    "sign",
-    "unwrapKey",
-    "verify",
-    "wrapKey",
-  ]
-
-  depends_on = [
-    azurerm_key_vault.test,
-  ]
-}
+  resource "azurerm_key_vault_key" "generated" {
+	name         = "keyVault"
+	key_vault_id = azurerm_key_vault.test.id
+	key_type     = "RSA"
+	key_size     = 2048
+
+	key_opts = [
+	  "decrypt",
+	  "encrypt",
+	  "sign",
+	  "unwrapKey",
+	  "verify",
+	  "wrapKey",
+	]
+
+	depends_on = [
+	  azurerm_key_vault.test,
+	]
+  }
 
-resource "azurerm_mssql_server_transparent_data_encryption" "test" {
-  server_id        = azurerm_mssql_server.test.id
-  key_vault_key_id = azurerm_key_vault_key.generated.id
-}
+  resource "azurerm_mssql_server_transparent_data_encryption" "test" {
+	server_id = azurerm_mssql_server.test.id
+	key_vault_key_id = azurerm_key_vault_key.generated.id
+  }
 `, r.server(data), data.RandomStringOfLength(5))
 }
 
 func (r MsSqlServerTransparentDataEncryptionResource) systemManaged(data acceptance.TestData) string {
-	return fmt.Sprintf(`
+	return fmt.Sprintf(
+		`
 %s
 
-resource "azurerm_mssql_server_transparent_data_encryption" "test" {
-  server_id = azurerm_mssql_server.test.id
-}
+  resource "azurerm_mssql_server_transparent_data_encryption" "test" {
+	server_id = azurerm_mssql_server.test.id
+  }
 `, r.server(data))
 }