wip

Author: Gnoale

cmd/tftemplate/main.go

@@ -6,9 +6,8 @@ import (
 	"log"
 	"text/template"
 
-	"tftemplate/models"
-
 	"github.com/AlecAivazis/survey/v2"
+	"tftemplate/models"
 )
 
 var (

internal/services/jobs/definition.go

@@ -208,24 +208,30 @@ func ResourceJobDefinitionRead(ctx context.Context, d *schema.ResourceData, m in
 	if err != nil {
 		if httperrors.Is404(err) {
 			d.SetId("")
+
 			return nil
 		}
+
 		return diag.FromErr(err)
 	}
 
-	var secretRefs []interface{}
-	for _, secret := range rawSecretRefs.Secrets {
+	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 = append(secretRefs, secretRef)
+
+		secretRefs[i] = secretRef
 	}
 
 	_ = d.Set("name", definition.Name)
@@ -316,12 +322,12 @@ func ResourceJobDefinitionUpdate(ctx context.Context, d *schema.ResourceData, m
 				return diag.FromErr(err)
 			}
 		}
+
 		if rawSecretReference, ok := d.GetOk("secret_reference"); ok {
 			if err := CreateJobDefinitionSecret(rawSecretReference, api, region, id); err != nil {
 				return diag.FromErr(err)
 			}
 		}
-
 	}
 
 	if _, err := api.UpdateJobDefinition(req, scw.WithContext(ctx)); err != nil {

internal/services/jobs/definition_test.go

@@ -161,7 +161,7 @@ func TestAccJobDefinition_Cron(t *testing.T) {
 	})
 }
 
-func TestCreateJobDefinitionWithSecretReference(t *testing.T) {
+func TestAccCreateJobDefinitionWithSecretReference(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 	resource.ParallelTest(t, resource.TestCase{
@@ -255,7 +255,7 @@ func TestCreateJobDefinitionWithSecretReference(t *testing.T) {
 	})
 }
 
-func TestCreateJobDefinitionWrongSecretReference(t *testing.T) {
+func TestAccCreateJobDefinitionWrongSecretReference(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 

internal/services/jobs/helpers.go

@@ -109,9 +109,11 @@ func expandJobDefinitionSecret(i any) []JobDefinitionSecret {
 	for _, rawSecret := range i.(*schema.Set).List() {
 		secretMap := rawSecret.(map[string]interface{})
 		env, file := "", ""
+
 		if userEnv, ok := secretMap["environment"].(string); ok {
 			env = userEnv
 		}
+
 		if userFile, ok := secretMap["file"].(string); ok {
 			file = userFile
 		}
@@ -138,30 +140,37 @@ func CreateJobDefinitionSecret(rawSecretReference any, api *jobs.API, region scw
 
 	for _, parsedSecretRef := range parsedSecretReferences {
 		secretVersion := "Latest"
+
 		if parsedSecretRef.SecretVersion != "" {
 			secretVersion = parsedSecretRef.SecretVersion
 		}
+
 		var secretConfig *jobs.CreateJobDefinitionSecretsRequestSecretConfig
+
 		if parsedSecretRef.Environment != "" {
 			secretConfig = &jobs.CreateJobDefinitionSecretsRequestSecretConfig{
 				SecretManagerID:      parsedSecretRef.SecretID,
 				SecretManagerVersion: secretVersion,
 				EnvVarName:           &parsedSecretRef.Environment,
 			}
 		}
+
 		if parsedSecretRef.File != "" {
 			secretConfig = &jobs.CreateJobDefinitionSecretsRequestSecretConfig{
 				SecretManagerID:      parsedSecretRef.SecretID,
 				SecretManagerVersion: secretVersion,
 				Path:                 &parsedSecretRef.File,
 			}
 		}
+
 		if parsedSecretRef.Environment != "" && parsedSecretRef.File != "" {
 			return fmt.Errorf("the secret id %s must have exactly one mount point: file or environment", parsedSecretRef.SecretID)
 		}
+
 		if parsedSecretRef.Environment == "" && parsedSecretRef.File == "" {
 			return fmt.Errorf("the secret id %s is missing a mount point: file or environment", parsedSecretRef.SecretID)
 		}
+
 		secrets = append(secrets, secretConfig)
 	}
 
@@ -170,5 +179,6 @@ func CreateJobDefinitionSecret(rawSecretReference any, api *jobs.API, region scw
 		JobDefinitionID: jobID,
 		Secrets:         secrets,
 	})
+
 	return err
 }