reverting to set. dont store kv secret value

hashicorp · Feb 6, 2024 · bddecb3 · bddecb3
1 parent 511fedc
commit bddecb3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/internal/services/containerapps/container_app_resource.go b/internal/services/containerapps/container_app_resource.go
@@ -17,6 +17,7 @@ import (
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/containerapps/2023-05-01/containerapps"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/containerapps/2023-05-01/managedenvironments"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/containerapps/helpers"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/containerapps/validate"
@@ -474,8 +475,8 @@ func (r ContainerAppResource) CustomizeDiff() sdk.ResourceFunc {
 
 			if metadata.ResourceDiff.HasChange("secret") {
 				stateSecretsRaw, configSecretsRaw := metadata.ResourceDiff.GetChange("secret")
-				stateSecrets := stateSecretsRaw.([]interface{})
-				configSecrets := configSecretsRaw.([]interface{})
+				stateSecrets := stateSecretsRaw.(*schema.Set).List()
+				configSecrets := configSecretsRaw.(*schema.Set).List()
 				// Check there's not less
 				if len(configSecrets) < len(stateSecrets) {
 					return fmt.Errorf("cannot remove secrets from Container Apps at this time due to a limitation in the Container Apps Service. Please see `https://github.com/microsoft/azure-container-apps/issues/395` for more details")

diff --git a/internal/services/containerapps/helpers/container_apps.go b/internal/services/containerapps/helpers/container_apps.go
@@ -2555,7 +2555,7 @@ type Secret struct {
 
 func SecretsSchema() *pluginsdk.Schema {
 	return &pluginsdk.Schema{
-		Type:      pluginsdk.TypeList,
+		Type:      pluginsdk.TypeSet,
 		Optional:  true,
 		Sensitive: true,
 		Elem: &pluginsdk.Resource{
@@ -2597,7 +2597,7 @@ func SecretsSchema() *pluginsdk.Schema {
 
 func SecretsDataSourceSchema() *pluginsdk.Schema {
 	return &pluginsdk.Schema{
-		Type:      pluginsdk.TypeList,
+		Type:      pluginsdk.TypeSet,
 		Computed:  true,
 		Sensitive: true,
 		Elem: &pluginsdk.Resource{
@@ -2810,12 +2810,15 @@ func FlattenContainerAppSecrets(input *containerapps.SecretsCollection) []Secret
 	}
 	result := make([]Secret, 0)
 	for _, v := range input.Value {
-		result = append(result, Secret{
+		secret := Secret{
 			Identity:         pointer.From(v.Identity),
 			KeyVaultSecretId: pointer.From(v.KeyVaultUrl),
 			Name:             pointer.From(v.Name),
-			Value:            pointer.From(v.Value),
-		})
+		}
+		if v.KeyVaultUrl == nil {
+			secret.Value = pointer.From(v.Value)
+		}
+		result = append(result, secret)
 	}
 
 	return result