From e803e3bd6f1f4ce3f704b945d4135b5ef91fc357 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Wed, 22 May 2024 16:15:31 +0200 Subject: [PATCH] fixup function test and add missing provider schema items --- internal/provider/framework/provider.go | 10 ++++++++++ ...{format_resource_id.go => normalise_resource_id.go} | 0 ...source_id_test.go => normalise_resource_id_test.go} | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) rename internal/provider/providerfunction/{format_resource_id.go => normalise_resource_id.go} (100%) rename internal/provider/providerfunction/{format_resource_id_test.go => normalise_resource_id_test.go} (98%) diff --git a/internal/provider/framework/provider.go b/internal/provider/framework/provider.go index 5f131e78fbbfd..ba57400596ac7 100644 --- a/internal/provider/framework/provider.go +++ b/internal/provider/framework/provider.go @@ -266,6 +266,11 @@ func (p *azureRmFrameworkProvider) Schema(_ context.Context, _ provider.SchemaRe Optional: true, }, + "purge_soft_deleted_hardware_security_module_keys_on_destroy": schema.BoolAttribute{ + Description: "When enabled soft-deleted `azurerm_key_vault_managed_hardware_security_module_key` resources will be permanently deleted (e.g purged), when destroyed", + Optional: true, + }, + "recover_soft_deleted_certificates": schema.BoolAttribute{ Description: "When enabled soft-deleted `azurerm_key_vault_certificate` resources will be restored, instead of creating new ones", Optional: true, @@ -285,6 +290,11 @@ func (p *azureRmFrameworkProvider) Schema(_ context.Context, _ provider.SchemaRe Description: "When enabled soft-deleted `azurerm_key_vault_secret` resources will be restored, instead of creating new ones", Optional: true, }, + + "recover_soft_deleted_hardware_security_module_keys": schema.BoolAttribute{ + Description: "When enabled soft-deleted `azurerm_key_vault_managed_hardware_security_module_key` resources will be restored, instead of creating new ones", + Optional: true, + }, }, }, }, diff --git a/internal/provider/providerfunction/format_resource_id.go b/internal/provider/providerfunction/normalise_resource_id.go similarity index 100% rename from internal/provider/providerfunction/format_resource_id.go rename to internal/provider/providerfunction/normalise_resource_id.go diff --git a/internal/provider/providerfunction/format_resource_id_test.go b/internal/provider/providerfunction/normalise_resource_id_test.go similarity index 98% rename from internal/provider/providerfunction/format_resource_id_test.go rename to internal/provider/providerfunction/normalise_resource_id_test.go index 99830ec180363..bbd59ebfc272b 100644 --- a/internal/provider/providerfunction/format_resource_id_test.go +++ b/internal/provider/providerfunction/normalise_resource_id_test.go @@ -47,7 +47,7 @@ func testOutputMultiple(cases map[string][]string) string { outputs += fmt.Sprintf(` output "%s" { - value = provider::azurerm::format_resource_id("%s") + value = provider::azurerm::normalise_resource_id("%s") } `, k, v[0])