Centralised job task sorting

Author: nfx

compute/model.go

@@ -588,6 +588,12 @@ func (js *JobSettings) isMultiTask() bool {
 	return js.Format == "MULTI_TASK" || len(js.Tasks) > 0
 }
 
+func (js *JobSettings) sortTasksByKey() {
+	sort.Slice(js.Tasks, func(i, j int) bool {
+		return js.Tasks[i].TaskKey < js.Tasks[j].TaskKey
+	})
+}
+
 // JobList ...
 type JobList struct {
 	Jobs []Job `json:"jobs"`

compute/resource_job.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -131,6 +130,7 @@ func (a JobsAPI) Restart(id string, timeout time.Duration) error {
 // Create creates a job on the workspace given the job settings
 func (a JobsAPI) Create(jobSettings JobSettings) (Job, error) {
 	var job Job
+	jobSettings.sortTasksByKey()
 	err := a.client.Post(a.context, "/jobs/create", jobSettings, &job)
 	return job, err
 }
@@ -156,6 +156,9 @@ func (a JobsAPI) Read(id string) (job Job, err error) {
 	err = wrapMissingJobError(a.client.Get(a.context, "/jobs/get", map[string]int64{
 		"job_id": jobID,
 	}, &job), id)
+	if job.Settings != nil {
+		job.Settings.sortTasksByKey()
+	}
 	return
 }
 
@@ -288,9 +291,6 @@ func ResourceJob() *schema.Resource {
 			if err != nil {
 				return err
 			}
-			sort.Slice(js.Tasks, func(i, j int) bool {
-				return js.Tasks[i].TaskKey < js.Tasks[j].TaskKey
-			})
 			if js.isMultiTask() {
 				ctx = context.WithValue(ctx, common.Api, common.API_2_1)
 			}
@@ -311,9 +311,6 @@ func ResourceJob() *schema.Resource {
 			if err != nil {
 				return err
 			}
-			sort.Slice(job.Settings.Tasks, func(i, j int) bool {
-				return job.Settings.Tasks[i].TaskKey < job.Settings.Tasks[j].TaskKey
-			})
 			d.Set("url", c.FormatURL("#job/", d.Id()))
 			return common.StructToData(*job.Settings, jobSchema, d)
 		},