ensure that the job refreshes after variables are saved (#1673)

Author: motatoes

backend/services/scheduler.go

@@ -103,19 +103,19 @@ func TriggerJob(gh utils.GithubClientProvider, ciBackend ci_backends.CiBackend,
 	runName, err := GetRunNameFromJob(*job)
 	if err != nil {
 		log.Printf("could not get run name: %v", err)
-		return fmt.Errorf("coult not get run name %v", err)
+		return fmt.Errorf("could not get run name %v", err)
 	}
 
 	spec, err := GetSpecFromJob(*job)
 	if err != nil {
 		log.Printf("could not get spec: %v", err)
-		return fmt.Errorf("coult not get spec %v", err)
+		return fmt.Errorf("could not get spec %v", err)
 	}
 
 	vcsToken, err := GetVCSTokenFromJob(*job, gh)
 	if err != nil {
 		log.Printf("could not get vcs token: %v", err)
-		return fmt.Errorf("coult not get vcs token: %v", err)
+		return fmt.Errorf("could not get vcs token: %v", err)
 	}
 
 	err = ciBackend.TriggerWorkflow(*spec, *runName, *vcsToken)

next/services/runs.go

@@ -43,15 +43,15 @@ func RunQueuesStateMachine(queueItem *model.DiggerRunQueueItem, service ci.PullR
 			return fmt.Errorf("could not get run name: %v", err)
 		}
 
-		err = RefreshVariableSpecForJob(*planJob)
+		err = RefreshVariableSpecForJob(planJob)
 		if err != nil {
 			log.Printf("could not get variable spec from job: %v", err)
 			return fmt.Errorf("could not get variable spec from job: %v", err)
 		}
 
 		// NOTE: We have to refresh both plan and apply jobs since we want to use exact same variables
 		// in both of these jobs
-		err = RefreshVariableSpecForJob(*applyJob)
+		err = RefreshVariableSpecForJob(applyJob)
 		if err != nil {
 			log.Printf("could not get variable spec from job: %v", err)
 			return fmt.Errorf("could not get variable spec from job: %v", err)

next/services/scheduler.go

@@ -67,10 +67,10 @@ func TriggerJob(gh utils.GithubClientProvider, ciBackend ci_backends.CiBackend,
 	runName, err := GetRunNameFromJob(*job)
 	if err != nil {
 		log.Printf("could not get run name: %v", err)
-		return fmt.Errorf("coult not get run name %v", err)
+		return fmt.Errorf("could not get run name %v", err)
 	}
 
-	err = RefreshVariableSpecForJob(*job)
+	err = RefreshVariableSpecForJob(job)
 	if err != nil {
 		log.Printf("could not get variable spec from job: %v", err)
 		return fmt.Errorf("could not get variable spec from job: %v", err)
@@ -79,13 +79,13 @@ func TriggerJob(gh utils.GithubClientProvider, ciBackend ci_backends.CiBackend,
 	spec, err := GetSpecFromJob(*job, lib_spec.SpecTypeApplyBeforeMergeJob)
 	if err != nil {
 		log.Printf("could not get spec: %v", err)
-		return fmt.Errorf("coult not get spec %v", err)
+		return fmt.Errorf("could not get spec %v", err)
 	}
 
 	vcsToken, err := GetVCSTokenFromJob(*job, gh)
 	if err != nil {
 		log.Printf("could not get vcs token: %v", err)
-		return fmt.Errorf("coult not get vcs token: %v", err)
+		return fmt.Errorf("could not get vcs token: %v", err)
 	}
 
 	err = ciBackend.TriggerWorkflow(*spec, *runName, *vcsToken)

next/services/spec.go

@@ -45,7 +45,7 @@ func GetVCSTokenFromJob(job model.DiggerJob, gh utils.GithubClientProvider) (*st
 	return &token, nil
 }
 
-func RefreshVariableSpecForJob(job model.DiggerJob) error {
+func RefreshVariableSpecForJob(job *model.DiggerJob) error {
 	var jobSpec scheduler.JobJson
 	err := json.Unmarshal([]byte(job.JobSpec), &jobSpec)
 	if err != nil {
@@ -111,7 +111,10 @@ func RefreshVariableSpecForJob(job model.DiggerJob) error {
 	}
 
 	job.VariablesSpec = marshalledSpecVariables
-	dbmodels.DB.GormDB.Save(job)
+	err = dbmodels.DB.GormDB.Save(job).Error
+	if err != nil {
+		return fmt.Errorf("failed to save spec variables: %v", err)
+	}
 
 	// here we get vars using project.ID for this project and load them into a specVariables, marshall
 	// them and then store them in job.VarsSpec
@@ -153,6 +156,7 @@ func GetSpecFromJob(job model.DiggerJob, specType spec.SpecType) (*spec.Spec, er
 	}
 
 	var variablesSpec []spec.VariableSpec
+	log.Printf("variablespec: %v", job.VariablesSpec)
 	err = json.Unmarshal(job.VariablesSpec, &variablesSpec)
 	if err != nil {
 		log.Printf("could not unmarshal variables spec: %v", err)