apply suggestions

Author: Gnoale

internal/services/jobs/helpers.go

@@ -136,6 +136,29 @@ func expandJobDefinitionSecret(i any) []JobDefinitionSecret {
 	return parsedSecrets
 }
 
+func flattenJobDefinitionSecret(jobSecrets []*jobs.Secret) []any {
+	secretRefs := make([]interface{}, len(jobSecrets))
+
+	for i, secret := range jobSecrets {
+		secretRef := make(map[string]interface{})
+		secretRef["secret_id"] = secret.SecretManagerID
+		secretRef["secret_reference_id"] = secret.SecretID
+		secretRef["secret_version"] = secret.SecretManagerVersion
+
+		if secret.File != nil {
+			secretRef["file"] = secret.File.Path
+		}
+
+		if secret.EnvVar != nil {
+			secretRef["environment"] = secret.EnvVar.Name
+		}
+
+		secretRefs[i] = secretRef
+	}
+
+	return secretRefs
+}
+
 func CreateJobDefinitionSecret(ctx context.Context, api *jobs.API, jobSecrets []JobDefinitionSecret, region scw.Region, jobID string) error {
 	secretConfigs := []*jobs.CreateJobDefinitionSecretsRequestSecretConfig{}
 

internal/services/jobs/jobs.go

@@ -111,9 +111,7 @@ 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, oldValue, newValue string, d *schema.ResourceData) bool {
-								return locality.ExpandID(oldValue) == locality.ExpandID(newValue)
-							},
+							DiffSuppressFunc:      dsf.Locality,
 						},
 						"secret_reference_id": {
 							Type:        schema.TypeString,
@@ -222,25 +220,6 @@ func ResourceJobDefinitionRead(ctx context.Context, d *schema.ResourceData, m in
 		return diag.FromErr(err)
 	}
 
-	secretRefs := make([]interface{}, len(rawSecretRefs.Secrets))
-
-	for i, secret := range rawSecretRefs.Secrets {
-		secretRef := make(map[string]interface{})
-		secretRef["secret_id"] = secret.SecretManagerID
-		secretRef["secret_reference_id"] = secret.SecretID
-		secretRef["secret_version"] = secret.SecretManagerVersion
-
-		if secret.File != nil {
-			secretRef["file"] = secret.File.Path
-		}
-
-		if secret.EnvVar != nil {
-			secretRef["environment"] = secret.EnvVar.Name
-		}
-
-		secretRefs[i] = secretRef
-	}
-
 	_ = d.Set("name", definition.Name)
 	_ = d.Set("cpu_limit", int(definition.CPULimit))
 	_ = d.Set("memory_limit", int(definition.MemoryLimit))
@@ -252,7 +231,7 @@ func ResourceJobDefinitionRead(ctx context.Context, d *schema.ResourceData, m in
 	_ = d.Set("cron", flattenJobDefinitionCron(definition.CronSchedule))
 	_ = d.Set("region", definition.Region)
 	_ = d.Set("project_id", definition.ProjectID)
-	_ = d.Set("secret_reference", secretRefs)
+	_ = d.Set("secret_reference", flattenJobDefinitionSecret(rawSecretRefs.Secrets))
 
 	return nil
 }