Merge pull request #10920 from dvob/master

key_vault_secret: Set value of recoverd key vault secret
hashicorp · Mar 11, 2021 · 1c277bc · 1c277bc
2 parents ec554b9 + aa4aab5
commit 1c277bc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/azurerm/internal/services/keyvault/key_vault_secret_resource.go b/azurerm/internal/services/keyvault/key_vault_secret_resource.go
@@ -170,6 +170,11 @@ func resourceKeyVaultSecretCreate(d *schema.ResourceData, meta interface{}) erro
 					return fmt.Errorf("Error waiting for Key Vault Secret %q to become available: %s", name, err)
 				}
 				log.Printf("[DEBUG] Secret %q recovered with ID: %q", name, *recoveredSecret.ID)
+
+				_, err := client.SetSecret(ctx, *keyVaultBaseUrl, name, parameters)
+				if err != nil {
+					return err
+				}
 			}
 		} else {
 			// If the error response was anything else, or `recover_soft_deleted_key_vaults` is `false` just return the error

diff --git a/azurerm/internal/services/keyvault/key_vault_secret_resource_test.go b/azurerm/internal/services/keyvault/key_vault_secret_resource_test.go
@@ -156,22 +156,22 @@ func TestAccKeyVaultSecret_recovery(t *testing.T) {
 
 	data.ResourceTest(t, r, []resource.TestStep{
 		{
-			Config: r.softDeleteRecovery(data, false),
+			Config: r.softDeleteRecovery(data, false, "first"),
 			Check: resource.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
-				check.That(data.ResourceName).Key("value").HasValue("rick-and-morty"),
+				check.That(data.ResourceName).Key("value").HasValue("first"),
 			),
 		},
 		{
-			Config:  r.softDeleteRecovery(data, false),
+			Config:  r.softDeleteRecovery(data, false, "first"),
 			Destroy: true,
 		},
 		{
 			// purge true here to make sure when we end the test there's no soft-deleted items left behind
-			Config: r.softDeleteRecovery(data, true),
+			Config: r.softDeleteRecovery(data, true, "second"),
 			Check: resource.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
-				check.That(data.ResourceName).Key("value").HasValue("rick-and-morty"),
+				check.That(data.ResourceName).Key("value").HasValue("second"),
 			),
 		},
 	})
@@ -395,7 +395,7 @@ resource "azurerm_key_vault_secret" "test" {
 `, r.template(data), data.RandomString)
 }
 
-func (r KeyVaultSecretResource) softDeleteRecovery(data acceptance.TestData, purge bool) string {
+func (r KeyVaultSecretResource) softDeleteRecovery(data acceptance.TestData, purge bool, value string) string {
 	return fmt.Sprintf(`
 provider "azurerm" {
   features {
@@ -410,10 +410,10 @@ provider "azurerm" {
 
 resource "azurerm_key_vault_secret" "test" {
   name         = "secret-%s"
-  value        = "rick-and-morty"
+  value        = "%s"
   key_vault_id = azurerm_key_vault.test.id
 }
-`, purge, r.template(data), data.RandomString)
+`, purge, r.template(data), data.RandomString, value)
 }
 
 func (KeyVaultSecretResource) withExternalAccessPolicy(data acceptance.TestData) string {