Fix canonicalization of services

api/jobs_test.go

@@ -242,7 +242,7 @@ func TestJobs_Canonicalize(t *testing.T) {
 										},
 									},
 								},
-								Services: []Service{
+								Services: []*Service{
 									{
 										Name:      "global-redis-check",
 										Tags:      []string{"global", "cache"},
@@ -327,7 +327,7 @@ func TestJobs_Canonicalize(t *testing.T) {
 										},
 									},
 								},
-								Services: []Service{
+								Services: []*Service{
 									{
 										Name:      "global-redis-check",
 										Tags:      []string{"global", "cache"},

api/jobs_testing.go

@@ -46,7 +46,7 @@ func MockJob() *Job {
 						Env: map[string]string{
 							"FOO": "bar",
 						},
-						Services: []Service{
+						Services: []*Service{
 							{
 								Name:      "${TASK}-frontend",
 								PortLabel: "http",

api/tasks.go

@@ -255,7 +255,7 @@ type Task struct {
 	Config          map[string]interface{}
 	Constraints     []*Constraint
 	Env             map[string]string
-	Services        []Service
+	Services        []*Service
 	Resources       *Resources
 	Meta            map[string]string
 	KillTimeout     *time.Duration `mapstructure:"kill_timeout"`
@@ -268,10 +268,6 @@ type Task struct {
 }
 
 func (t *Task) Canonicalize(tg *TaskGroup, job *Job) {
-	for _, s := range t.Services {
-		s.Canonicalize(t, tg, job)
-	}
-
 	min := MinResources()
 	min.Merge(t.Resources)
 	min.Canonicalize()
@@ -294,6 +290,9 @@ func (t *Task) Canonicalize(tg *TaskGroup, job *Job) {
 	for _, tmpl := range t.Templates {
 		tmpl.Canonicalize()
 	}
+	for _, s := range t.Services {
+		s.Canonicalize(t, tg, job)
+	}
 }
 
 // TaskArtifact is used to download artifacts before running a task.

command/agent/job_endpoint_test.go

@@ -765,7 +765,7 @@ func TestJobs_ApiJobToStructsJob(t *testing.T) {
 							},
 						},
 
-						Services: []api.Service{
+						Services: []*api.Service{
 							{
 								Id:        "id",
 								Name:      "serviceA",

jobspec/parse.go

@@ -898,7 +898,7 @@ func parseTemplates(result *[]*api.Template, list *ast.ObjectList) error {
 }
 
 func parseServices(jobName string, taskGroupName string, task *api.Task, serviceObjs *ast.ObjectList) error {
-	task.Services = make([]api.Service, len(serviceObjs.Items))
+	task.Services = make([]*api.Service, len(serviceObjs.Items))
 	for idx, o := range serviceObjs.Items {
 		// Check for invalid keys
 		valid := []string{
@@ -937,7 +937,7 @@ func parseServices(jobName string, taskGroupName string, task *api.Task, service
 			}
 		}
 
-		task.Services[idx] = service
+		task.Services[idx] = &service
 	}
 
 	return nil

jobspec/parse_test.go

@@ -105,7 +105,7 @@ func TestParse(t *testing.T) {
 										},
 									},
 								},
-								Services: []api.Service{
+								Services: []*api.Service{
 									{
 										Tags:      []string{"foo", "bar"},
 										PortLabel: "http",
@@ -410,7 +410,7 @@ func TestParse(t *testing.T) {
 						Tasks: []*api.Task{
 							&api.Task{
 								Name: "task",
-								Services: []api.Service{
+								Services: []*api.Service{
 									{
 										Tags:      []string{"foo", "bar"},
 										PortLabel: "http",