wip

Author: Gnoale

internal/services/jobs/definition.go

@@ -101,6 +101,7 @@ func ResourceDefinition() *schema.Resource {
 					if secret["environment"] != "" {
 						return schema.HashString(locality.ExpandID(secret["secret_id"].(string)) + secret["secret_version"].(string) + secret["environment"].(string))
 					}
+
 					return schema.HashString(locality.ExpandID(secret["secret_id"].(string)) + secret["secret_version"].(string) + secret["file"].(string))
 				},
 				Elem: &schema.Resource{
@@ -110,8 +111,8 @@ func ResourceDefinition() *schema.Resource {
 							Description:           "The secret unique identifier, it could be formatted as region/UUID or UUID. In case the region is passed, it must be the same as the job definition.",
 							Required:              true,
 							DiffSuppressOnRefresh: true,
-							DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
-								return locality.ExpandID(old) == locality.ExpandID(new)
+							DiffSuppressFunc: func(k, oldValue, newValue string, d *schema.ResourceData) bool {
+								return locality.ExpandID(oldValue) == locality.ExpandID(newValue)
 							},
 						},
 						"secret_reference_id": {

internal/services/jobs/definition_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/jobs"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestAccJobDefinition_Basic(t *testing.T) {
@@ -521,7 +522,7 @@ func TestDiffJobDefinitionSecrets(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {
 			toCreate, toDelete, err := jobs.DiffJobDefinitionSecrets(testCase.oldSecretRefs, testCase.newSecretRefs)
-			assert.NoError(t, err)
+			require.Error(t, err)
 			assert.Equal(t, testCase.expectedToCreate, toCreate)
 			assert.Equal(t, testCase.expectedToDelete, toDelete)
 		})

internal/services/jobs/helpers.go

@@ -143,11 +143,13 @@ func CreateJobDefinitionSecret(ctx context.Context, api *jobs.API, jobSecrets []
 		secretConfig := &jobs.CreateJobDefinitionSecretsRequestSecretConfig{}
 
 		secretConfigs = append(secretConfigs, secretConfig)
+
 		if parsedSecretRef.SecretID.Region.String() != "" {
 			if parsedSecretRef.SecretID.Region.String() != region.String() {
 				return fmt.Errorf("the secret id %s is in the region %s, expected %s", parsedSecretRef.SecretID, parsedSecretRef.SecretID.Region, region)
 			}
 		}
+
 		secretConfig.SecretManagerID = parsedSecretRef.SecretID.ID
 		secretConfig.SecretManagerVersion = parsedSecretRef.SecretVersion