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_recovery_services_vault - fix acctest #18871

Merged
merged 1 commit into from
Oct 20, 2022
Merged

azurerm_recovery_services_vault - fix acctest #18871

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
133 changes: 66 additions & 67 deletions internal/services/recoveryservices/recovery_services_vault_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,40 +187,6 @@ func resourceRecoveryServicesVaultCreate(d *pluginsdk.ResourceData, meta interfa
if err := future.WaitForCompletionRef(ctx, client.Client); err != nil {
return fmt.Errorf("waiting for creation of %q: %+v", id, err)
}
cfg := backup.ResourceVaultConfigResource{
Properties: &backup.ResourceVaultConfig{
EnhancedSecurityState: backup.EnhancedSecurityStateEnabled, // always enabled
},
}

if sd := d.Get("soft_delete_enabled").(bool); sd {
cfg.Properties.SoftDeleteFeatureState = backup.SoftDeleteFeatureStateEnabled
} else {
cfg.Properties.SoftDeleteFeatureState = backup.SoftDeleteFeatureStateDisabled
}

stateConf := &pluginsdk.StateChangeConf{
Pending: []string{"syncing"},
Target: []string{"success"},
MinTimeout: 30 * time.Second,
Refresh: func() (interface{}, string, error) {
resp, err := cfgsClient.Update(ctx, id.Name, id.ResourceGroup, cfg)
if err != nil {
if strings.Contains(err.Error(), "ResourceNotYetSynced") {
return resp, "syncing", nil
}
return resp, "error", fmt.Errorf("updating Recovery Service Vault Cfg %s: %+v", id.String(), err)
}

return resp, "success", nil
},
}

stateConf.Timeout = d.Timeout(pluginsdk.TimeoutCreate)

if _, err := stateConf.WaitForStateContext(ctx); err != nil {
return fmt.Errorf("waiting for on update for Recovery Service %s: %+v", id.String(), err)
}

storageCfg := backup.ResourceConfigResource{
Properties: &backup.ResourceConfig{
Expand All @@ -229,7 +195,7 @@ func resourceRecoveryServicesVaultCreate(d *pluginsdk.ResourceData, meta interfa
},
}

err = pluginsdk.Retry(stateConf.Timeout, func() *pluginsdk.RetryError {
err = pluginsdk.Retry(d.Timeout(pluginsdk.TimeoutCreate), func() *pluginsdk.RetryError {
if resp, err := storageCfgsClient.Update(ctx, id.Name, id.ResourceGroup, storageCfg); err != nil {
if utils.ResponseWasNotFound(resp.Response) {
return pluginsdk.RetryableError(fmt.Errorf("updating Recovery Service Storage Cfg %s: %+v", id.String(), err))
Expand All @@ -247,7 +213,7 @@ func resourceRecoveryServicesVaultCreate(d *pluginsdk.ResourceData, meta interfa
}

// storage type is not updated instantaneously, so we wait until storage type is correct
err = pluginsdk.Retry(stateConf.Timeout, func() *pluginsdk.RetryError {
err = pluginsdk.Retry(d.Timeout(pluginsdk.TimeoutCreate), func() *pluginsdk.RetryError {
if resp, err := storageCfgsClient.Get(ctx, id.Name, id.ResourceGroup); err == nil {
if resp.Properties == nil {
return pluginsdk.NonRetryableError(fmt.Errorf("updating %s Storage Config: `properties` was nil", id))
Expand Down Expand Up @@ -283,6 +249,40 @@ func resourceRecoveryServicesVaultCreate(d *pluginsdk.ResourceData, meta interfa
}
}

// an update on the vault will reset the vault config to default, so we handle it at last.
cfg := backup.ResourceVaultConfigResource{
Properties: &backup.ResourceVaultConfig{
EnhancedSecurityState: backup.EnhancedSecurityStateEnabled, // always enabled
},
}
if sd := d.Get("soft_delete_enabled").(bool); sd {
cfg.Properties.SoftDeleteFeatureState = backup.SoftDeleteFeatureStateEnabled
} else {
cfg.Properties.SoftDeleteFeatureState = backup.SoftDeleteFeatureStateDisabled
}
stateConf := &pluginsdk.StateChangeConf{
Pending: []string{"syncing"},
Target: []string{"success"},
MinTimeout: 30 * time.Second,
Refresh: func() (interface{}, string, error) {
resp, err := cfgsClient.Update(ctx, id.Name, id.ResourceGroup, cfg)
if err != nil {
if strings.Contains(err.Error(), "ResourceNotYetSynced") {
return resp, "syncing", nil
}
return resp, "error", fmt.Errorf("updating Recovery Service Vault Cfg %s: %+v", id.String(), err)
}

return resp, "success", nil
},
}

stateConf.Timeout = d.Timeout(pluginsdk.TimeoutCreate)

if _, err := stateConf.WaitForStateContext(ctx); err != nil {
return fmt.Errorf("waiting for on update for Recovery Service %s: %+v", id.String(), err)
}

d.SetId(id.ID())
return resourceRecoveryServicesVaultRead(d, meta)
}
Expand Down Expand Up @@ -335,37 +335,6 @@ func resourceRecoveryServicesVaultUpdate(d *pluginsdk.ResourceData, meta interfa
},
}

if d.HasChange("soft_delete_enabled") {
if sd := d.Get("soft_delete_enabled").(bool); sd {
cfg.Properties.SoftDeleteFeatureState = backup.SoftDeleteFeatureStateEnabled
} else {
cfg.Properties.SoftDeleteFeatureState = backup.SoftDeleteFeatureStateDisabled
}

stateConf := &pluginsdk.StateChangeConf{
Pending: []string{"syncing"},
Target: []string{"success"},
MinTimeout: 30 * time.Second,
Refresh: func() (interface{}, string, error) {
resp, err := cfgsClient.Update(ctx, id.Name, id.ResourceGroup, cfg)
if err != nil {
if strings.Contains(err.Error(), "ResourceNotYetSynced") {
return resp, "syncing", nil
}
return resp, "error", fmt.Errorf("updating Recovery Service Vault Cfg %s: %+v", id.String(), err)
}

return resp, "success", nil
},
}

stateConf.Timeout = d.Timeout(pluginsdk.TimeoutUpdate)

if _, err := stateConf.WaitForStateContext(ctx); err != nil {
return fmt.Errorf("waiting for on update for Recovery Service %s: %+v", id.String(), err)
}
}

if d.HasChanges("storage_mode_type", "cross_region_restore_enabled") {
storageCfg := backup.ResourceConfigResource{
Properties: &backup.ResourceConfig{
Expand Down Expand Up @@ -465,6 +434,36 @@ func resourceRecoveryServicesVaultUpdate(d *pluginsdk.ResourceData, meta interfa
return fmt.Errorf("waiting for update encryption of %s: %+v", id, err)
}

// an update on vault will cause the vault config reset to default, so whether the config has change or not, it needs to be updated.
if sd := d.Get("soft_delete_enabled").(bool); sd {
cfg.Properties.SoftDeleteFeatureState = backup.SoftDeleteFeatureStateEnabled
} else {
cfg.Properties.SoftDeleteFeatureState = backup.SoftDeleteFeatureStateDisabled
}

stateConf := &pluginsdk.StateChangeConf{
Pending: []string{"syncing"},
Target: []string{"success"},
MinTimeout: 30 * time.Second,
Refresh: func() (interface{}, string, error) {
resp, err := cfgsClient.Update(ctx, id.Name, id.ResourceGroup, cfg)
if err != nil {
if strings.Contains(err.Error(), "ResourceNotYetSynced") {
return resp, "syncing", nil
}
return resp, "error", fmt.Errorf("updating Recovery Service Vault Cfg %s: %+v", id.String(), err)
}

return resp, "success", nil
},
}

stateConf.Timeout = d.Timeout(pluginsdk.TimeoutUpdate)

if _, err := stateConf.WaitForStateContext(ctx); err != nil {
return fmt.Errorf("waiting for on update for Recovery Service %s: %+v", id.String(), err)
}

d.SetId(id.ID())
return resourceRecoveryServicesVaultRead(d, meta)
}
Expand Down
94 changes: 94 additions & 0 deletions internal/services/recoveryservices/recovery_services_vault_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,13 @@ func TestAccRecoveryServicesVault_softDelete(t *testing.T) {
),
},
data.ImportStep(),
{
Config: r.softDeleteDisabledWithEncryption(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

Expand Down Expand Up @@ -660,6 +667,93 @@ resource "azurerm_recovery_services_vault" "test" {
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
}

func (RecoveryServicesVaultResource) softDeleteDisabledWithEncryption(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {
key_vault {
purge_soft_delete_on_destroy = true
purge_soft_deleted_keys_on_destroy = false
}
}
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-recovery-%[1]d"
location = "%[2]s"
}

data "azurerm_client_config" "current" {}

resource "azurerm_key_vault" "test" {
name = "acctest-key-vault-%[3]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 = [
"Create",
"Decrypt",
"Encrypt",
"Delete",
"Get",
"List",
"Purge",
"UnwrapKey",
"WrapKey",
"Verify",
]
secret_permissions = [
"Set",
]
}
}

resource "azurerm_key_vault_key" "test" {
name = "acctest-key-vault-key"
key_vault_id = azurerm_key_vault.test.id
key_type = "RSA"
key_size = 2048

key_opts = [
"decrypt",
"encrypt",
"sign",
"unwrapKey",
"verify",
"wrapKey",
]
}

resource "azurerm_recovery_services_vault" "test" {
name = "acctest-Vault-%[1]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
sku = "Standard"

soft_delete_enabled = false

encryption {
key_id = azurerm_key_vault_key.test.id
infrastructure_encryption_enabled = false
}

identity {
type = "SystemAssigned"
}
}
`, data.RandomInteger, data.Locations.Primary, data.RandomString)
}

func (RecoveryServicesVaultResource) softDeleteDisabled(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
Expand Down