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

r/key_vault: defaulting soft_delete_enabled on to match the updated API behaviour #10088

Merged
merged 8 commits into from
Jan 8, 2021
Merged

r/key_vault: defaulting soft_delete_enabled on to match the updated API behaviour #10088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
84d19e7
d/key_vault: deprecating the soft_delete_enabled property
tombuildsstuff Jan 7, 2021
b9f10a3
r/key_vault: deprecate `soft_delete_enabled` & default `soft_delete_r…
tombuildsstuff Jan 7, 2021
d6821a6
r/key_vault: updating the error message to better indicate that `soft…
tombuildsstuff Jan 7, 2021
aa880a6
r/key_vault: adding a state migration for soft delete retention days
tombuildsstuff Jan 7, 2021
c8e9272
r/key_vault_key: switching to use a premium sku for the hsm tests
tombuildsstuff Jan 7, 2021
2e3133d
r/key_vault: removing soft_delete_enabled from the tests
tombuildsstuff Jan 7, 2021
2917218
fmt
tombuildsstuff Jan 7, 2021
bde6e96
fix linting
katbyte Jan 7, 2021
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
250 changes: 130 additions & 120 deletions azurerm/internal/services/keyvault/key_vault_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault/validate"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/set"
Expand All @@ -23,137 +24,142 @@ func dataSourceKeyVault() *schema.Resource {
Read: schema.DefaultTimeout(5 * time.Minute),
},

Schema: map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validate.KeyVaultName,
},

"resource_group_name": azure.SchemaResourceGroupNameForDataSource(),

"location": azure.SchemaLocationForDataSource(),

"sku_name": {
Type: schema.TypeString,
Computed: true,
},

"vault_uri": {
Type: schema.TypeString,
Computed: true,
},

"tenant_id": {
Type: schema.TypeString,
Computed: true,
},

"access_policy": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"tenant_id": {
Type: schema.TypeString,
Computed: true,
},
"object_id": {
Type: schema.TypeString,
Computed: true,
},
"application_id": {
Type: schema.TypeString,
Computed: true,
},
"certificate_permissions": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
Schema: func() map[string]*schema.Schema {
dsSchema := map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validate.KeyVaultName,
},

"resource_group_name": azure.SchemaResourceGroupNameForDataSource(),

"location": azure.SchemaLocationForDataSource(),

"sku_name": {
Type: schema.TypeString,
Computed: true,
},

"vault_uri": {
Type: schema.TypeString,
Computed: true,
},

"tenant_id": {
Type: schema.TypeString,
Computed: true,
},

"access_policy": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"tenant_id": {
Type: schema.TypeString,
Computed: true,
},
},
"key_permissions": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
"object_id": {
Type: schema.TypeString,
Computed: true,
},
},
"secret_permissions": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
"application_id": {
Type: schema.TypeString,
Computed: true,
},
},
"storage_permissions": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
"certificate_permissions": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"key_permissions": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"secret_permissions": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"storage_permissions": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
},
},
},
},

"enabled_for_deployment": {
Type: schema.TypeBool,
Computed: true,
},

"enabled_for_disk_encryption": {
Type: schema.TypeBool,
Computed: true,
},

"enabled_for_template_deployment": {
Type: schema.TypeBool,
Computed: true,
},

"network_acls": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"default_action": {
Type: schema.TypeString,
Computed: true,
},
"bypass": {
Type: schema.TypeString,
Computed: true,
},
"ip_rules": {
Type: schema.TypeSet,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: schema.HashString,
},
"virtual_network_subnet_ids": {
Type: schema.TypeSet,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: set.HashStringIgnoreCase,

"enabled_for_deployment": {
Type: schema.TypeBool,
Computed: true,
},

"enabled_for_disk_encryption": {
Type: schema.TypeBool,
Computed: true,
},

"enabled_for_template_deployment": {
Type: schema.TypeBool,
Computed: true,
},

"network_acls": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"default_action": {
Type: schema.TypeString,
Computed: true,
},
"bypass": {
Type: schema.TypeString,
Computed: true,
},
"ip_rules": {
Type: schema.TypeSet,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: schema.HashString,
},
"virtual_network_subnet_ids": {
Type: schema.TypeSet,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: set.HashStringIgnoreCase,
},
},
},
},
},

"purge_protection_enabled": {
Type: schema.TypeBool,
Computed: true,
},

"soft_delete_enabled": {
Type: schema.TypeBool,
Computed: true,
},
"purge_protection_enabled": {
Type: schema.TypeBool,
Computed: true,
},

"tags": tags.SchemaDataSource(),
},
"tags": tags.SchemaDataSource(),
}
if !features.ThreePointOh() {
dsSchema["soft_delete_enabled"] = &schema.Schema{
Type: schema.TypeBool,
Computed: true,
Deprecated: `Azure has removed support for disabling Soft Delete as of 2020-12-15, as such this field will always return 'true' and will be removed in version 3.0 of the Azure Provider.`,
}
}
return dsSchema
}(),
}
}

Expand Down Expand Up @@ -186,10 +192,14 @@ func dataSourceKeyVaultRead(d *schema.ResourceData, meta interface{}) error {
d.Set("enabled_for_deployment", props.EnabledForDeployment)
d.Set("enabled_for_disk_encryption", props.EnabledForDiskEncryption)
d.Set("enabled_for_template_deployment", props.EnabledForTemplateDeployment)
d.Set("soft_delete_enabled", props.EnableSoftDelete)
d.Set("purge_protection_enabled", props.EnablePurgeProtection)
d.Set("vault_uri", props.VaultURI)

// TODO: remove in 3.0
if !features.ThreePointOh() {
d.Set("soft_delete_enabled", true)
}

if sku := props.Sku; sku != nil {
if err := d.Set("sku_name", string(sku.Name)); err != nil {
return fmt.Errorf("Error setting `sku_name` for KeyVault %q: %+v", *resp.Name, err)
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/keyvault/key_vault_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,5 +133,5 @@ data "azurerm_key_vault" "test" {
name = azurerm_key_vault.test.name
resource_group_name = azurerm_key_vault.test.resource_group_name
}
`, KeyVaultResource{}.softDelete(data, true))
`, KeyVaultResource{}.softDelete(data))
}
Loading