Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azurerm_disk_encryption_set - remove unnecessary validation on key vault purge protection #20253

Merged
merged 1 commit into from
Feb 6, 2023
Merged

azurerm_disk_encryption_set - remove unnecessary validation on key vault purge protection #20253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions internal/services/compute/disk_encryption_set_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,6 @@ func resourceDiskEncryptionSetCreate(d *pluginsdk.ResourceData, meta interface{}
if !keyVaultDetails.softDeleteEnabled {
return fmt.Errorf("validating Key Vault %q (Resource Group %q) for Disk Encryption Set: Soft Delete must be enabled but it isn't!", keyVaultDetails.keyVaultName, keyVaultDetails.resourceGroupName)
}
if !keyVaultDetails.purgeProtectionEnabled {
return fmt.Errorf("validating Key Vault %q (Resource Group %q) for Disk Encryption Set: Purge Protection must be enabled but it isn't!", keyVaultDetails.keyVaultName, keyVaultDetails.resourceGroupName)
}
}

rotationToLatestKeyVersionEnabled := d.Get("auto_key_rotation_enabled").(bool)
Expand Down
58 changes: 52 additions & 6 deletions internal/services/compute/disk_encryption_set_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,22 @@ func TestAccDiskEncryptionSet_withFederatedClientId(t *testing.T) {
})
}

func TestAccDiskEncryptionSet_disablePurgeProtection(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_disk_encryption_set", "test")
r := DiskEncryptionSetResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.disablePurgeProtection(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That(data.ResourceName).Key("encryption_type").HasValue("EncryptionAtRestWithCustomerKey"),
),
},
data.ImportStep(),
})
}

func (DiskEncryptionSetResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
id, err := diskencryptionsets.ParseDiskEncryptionSetID(state.ID)
if err != nil {
Expand All @@ -190,7 +206,7 @@ func (DiskEncryptionSetResource) Exists(ctx context.Context, clients *clients.Cl
return utils.Bool(model.Id != nil), nil
}

func (DiskEncryptionSetResource) dependencies(data acceptance.TestData) string {
func (DiskEncryptionSetResource) dependencies(data acceptance.TestData, purgeProtectionEnabled bool) string {
return fmt.Sprintf(`
provider "azurerm" {
features {
Expand All @@ -215,7 +231,7 @@ 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"
purge_protection_enabled = true
purge_protection_enabled = %t
enabled_for_disk_encryption = true
}

Expand Down Expand Up @@ -258,7 +274,7 @@ resource "azurerm_key_vault_key" "test" {
depends_on = ["azurerm_key_vault_access_policy.service-principal"]
}

`, data.RandomInteger, data.Locations.Primary, data.RandomString)
`, data.RandomInteger, data.Locations.Primary, data.RandomString, purgeProtectionEnabled)
}

func (r DiskEncryptionSetResource) systemAssignedDependencies(data acceptance.TestData) string {
Expand All @@ -276,7 +292,7 @@ resource "azurerm_key_vault_access_policy" "disk-encryption" {

tenant_id = azurerm_disk_encryption_set.test.identity.0.tenant_id
object_id = azurerm_disk_encryption_set.test.identity.0.principal_id
}`, r.dependencies(data))
}`, r.dependencies(data, true))
}

func (r DiskEncryptionSetResource) basic(data acceptance.TestData) string {
Expand Down Expand Up @@ -428,7 +444,7 @@ resource "azurerm_disk_encryption_set" "test" {

depends_on = ["azurerm_key_vault_access_policy.user-assigned"]
}
`, r.dependencies(data), data.RandomInteger)
`, r.dependencies(data, true), data.RandomInteger)
}

func (r DiskEncryptionSetResource) systemAssignedUserAssignedIdentity(data acceptance.TestData) string {
Expand Down Expand Up @@ -518,5 +534,35 @@ resource "azurerm_disk_encryption_set" "test" {

depends_on = ["azurerm_key_vault_access_policy.user-assigned"]
}
`, r.dependencies(data), data.RandomInteger, federatedClientId)
`, r.dependencies(data, true), data.RandomInteger, federatedClientId)
}

func (r DiskEncryptionSetResource) disablePurgeProtection(data acceptance.TestData) string {
return fmt.Sprintf(`
%s

resource "azurerm_key_vault_access_policy" "disk-encryption" {
key_vault_id = azurerm_key_vault.test.id

key_permissions = [
"Get",
"WrapKey",
"UnwrapKey",
]

tenant_id = azurerm_disk_encryption_set.test.identity.0.tenant_id
object_id = azurerm_disk_encryption_set.test.identity.0.principal_id
}

resource "azurerm_disk_encryption_set" "test" {
name = "acctestDES-%d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
key_vault_key_id = azurerm_key_vault_key.test.id

identity {
type = "SystemAssigned"
}
}
`, r.dependencies(data, false), data.RandomInteger)
}