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_key_vault_secret: fix empty check for expiration in CustomizeDiff #28920

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

azurerm_key_vault_secret: fix empty check for expiration in CustomizeDiff #28920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a565a40
fix empty check for expiration in schemaDiff check
wuxu92 Feb 28, 2025
ec0e816
add acc test for expiration_date whilst not testing forcenew
wuxu92 Feb 28, 2025
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
7 changes: 4 additions & 3 deletions internal/services/keyvault/key_vault_secret_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,11 @@ func resourceKeyVaultSecret() *pluginsdk.Resource {
},

CustomizeDiff: pluginsdk.CustomDiffWithAll(
pluginsdk.ForceNewIfChange("expiration_date", func(ctx context.Context, oldVal, newVal interface{}, meta interface{}) bool {
pluginsdk.ForceNewIf("expiration_date", func(ctx context.Context, d *pluginsdk.ResourceDiff, meta interface{}) bool {
// if change from non-nil to nil, we need to force new
if oldVal != nil && oldVal.(string) != "" {
return newVal == nil || newVal.(string) == ""
old, _ := d.GetChange("expiration_date")
if old.(string) != "" && d.GetRawConfig().AsValueMap()["expiration_date"].IsNull() {
return true
}
return false
}),
Expand Down
41 changes: 41 additions & 0 deletions internal/services/keyvault/key_vault_secret_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"fmt"
"regexp"
"testing"
"time"

"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
Expand Down Expand Up @@ -127,6 +128,29 @@ func TestAccKeyVaultSecret_update(t *testing.T) {
})
}

func TestAccKeyVaultSecret_updateExpiration(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_key_vault_secret", "test")
r := KeyVaultSecretResource{}
expirationDate := time.Now().Add(30 * 24 * time.Hour).In(time.UTC)

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.withExpiration(data, expirationDate.Format(time.RFC3339)),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That(data.ResourceName).Key("value").HasValue("rick-and-morty"),
),
},
{
Config: r.withExpiration(data, expirationDate.Add(24*time.Hour).Format(time.RFC3339)),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That(data.ResourceName).Key("value").HasValue("rick-and-morty"),
),
},
})
}

func TestAccKeyVaultSecret_updatingValueChangedExternally(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_key_vault_secret", "test")
r := KeyVaultSecretResource{}
Expand Down Expand Up @@ -312,6 +336,23 @@ func (r KeyVaultSecretResource) updateSecretValue(value string) acceptance.Clien
}
}

func (r KeyVaultSecretResource) withExpiration(data acceptance.TestData, expiration_date string) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}

%s

resource "azurerm_key_vault_secret" "test" {
name = "secret-%s"
value = "rick-and-morty"
key_vault_id = azurerm_key_vault.test.id
expiration_date = "%s"
}
`, r.template(data), data.RandomString, expiration_date)
}

func (r KeyVaultSecretResource) basic(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
Expand Down
Loading