fix(functionNamespace): support secret_environment_variable state

Author: Gnoale

internal/services/function/helpers_function_test.go renamed to internal/services/function/helpers_function_internal_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	function "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/dsf"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
@@ -71,7 +72,9 @@ func ResourceNamespace() *schema.Resource {
 					Type:         schema.TypeString,
 					ValidateFunc: validation.StringLenBetween(0, 1000),
 				},
-				ValidateDiagFunc: validation.MapKeyLenBetween(0, 100),
+				ValidateDiagFunc:      validation.MapKeyLenBetween(0, 100),
+				DiffSuppressFunc:      dsf.CompareArgon2idPasswordAndHash,
+				DiffSuppressOnRefresh: true,
 			},
 			"registry_endpoint": {
 				Type:        schema.TypeString,
@@ -151,6 +154,7 @@ func ResourceFunctionNamespaceRead(ctx context.Context, d *schema.ResourceData,
 	_ = d.Set("region", ns.Region)
 	_ = d.Set("registry_endpoint", ns.RegistryEndpoint)
 	_ = d.Set("registry_namespace_id", ns.RegistryNamespaceID)
+	_ = d.Set("secret_environment_variables", flattenFunctionSecrets(ns.SecretEnvironmentVariables))
 
 	return nil
 }
@@ -190,7 +194,8 @@ func ResourceFunctionNamespaceUpdate(ctx context.Context, d *schema.ResourceData
 	}
 
 	if d.HasChanges("secret_environment_variables") {
-		req.SecretEnvironmentVariables = expandFunctionsSecrets(d.Get("secret_environment_variables"))
+		oldEnv, newEnv := d.GetChange("secret_environment_variables")
+		req.SecretEnvironmentVariables = filterSecretEnvsToPatch(expandFunctionsSecrets(oldEnv), expandFunctionsSecrets(newEnv))
 	}
 
 	if _, err := api.UpdateNamespace(req, scw.WithContext(ctx)); err != nil {

internal/services/function/namespace.go

@@ -68,7 +68,7 @@ func TestAccFunctionNamespace_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "description", ""),
 					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "name", "test-cr-ns-01"),
 					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "environment_variables.test", "test"),
-					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "secret_environment_variables.test_secret", "test_secret"),
+					passwordMatchHash("scaleway_function_namespace.main", "secret_environment_variables.test_secret", "test_secret"),
 					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "tags.#", "0"),
 
 					acctest.CheckResourceAttrUUID("scaleway_function_namespace.main", "id"),
@@ -92,7 +92,7 @@ func TestAccFunctionNamespace_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "description", ""),
 					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "name", "test-cr-ns-01"),
 					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "environment_variables.test", "test"),
-					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "secret_environment_variables.test_secret", "test_secret"),
+					passwordMatchHash("scaleway_function_namespace.main", "secret_environment_variables.test_secret", "test_secret"),
 					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "tags.#", "2"),
 					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "tags.0", "tag1"),
 					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "tags.1", "tag2"),
@@ -142,13 +142,16 @@ func TestAccFunctionNamespace_EnvironmentVariables(t *testing.T) {
 						environment_variables = {
 							"test" = "test"
 						}
+						secret_environment_variables = {
+							"test_secret" = "test_secret"
+						}
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckFunctionNamespaceExists(tt, "scaleway_function_namespace.main"),
 					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "name", "tf-env-test"),
 					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "environment_variables.test", "test"),
-
+					passwordMatchHash("scaleway_function_namespace.main", "secret_environment_variables.test_secret", "test_secret"),
 					acctest.CheckResourceAttrUUID("scaleway_function_namespace.main", "id"),
 				),
 			},
@@ -159,13 +162,16 @@ func TestAccFunctionNamespace_EnvironmentVariables(t *testing.T) {
 						environment_variables = {
 							"foo" = "bar"
 						}
+						secret_environment_variables = {
+							"test_secret" = "updated_secret"
+						}
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckFunctionNamespaceExists(tt, "scaleway_function_namespace.main"),
 					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "name", "tf-env-test"),
 					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "environment_variables.foo", "bar"),
-
+					passwordMatchHash("scaleway_function_namespace.main", "secret_environment_variables.test_secret", "updated_secret"),
 					acctest.CheckResourceAttrUUID("scaleway_function_namespace.main", "id"),
 				),
 			},