Add sidecar_task stanza parsing (#6104)

* jobspec: breakup parse.go into smaller files

* add sidecar_task parsing to jobspec and api

* jobspec: combine service parsing logic for task and group service stanzas

* api: use slice of ConsulUpstream values instead of pointers

api/services.go

@@ -135,6 +135,7 @@ func (s *Service) Canonicalize(t *Task, tg *TaskGroup, job *Job) {
 type ConsulConnect struct {
 	Native         bool
 	SidecarService *ConsulSidecarService `mapstructure:"sidecar_service"`
+	SidecarTask    *Task                 `mapstructure:"sidecar_task"`
 }
 
 // ConsulSidecarService represents a Consul Connect SidecarService jobspec

command/agent/job_endpoint.go

@@ -1007,39 +1007,50 @@ func ApiServicesToStructs(in []*api.Service) []*structs.Service {
 			}
 		}
 
-		if s.Connect == nil {
-			continue
+		if s.Connect != nil {
+			out[i].Connect = ApiConsulConnectToStructs(s.Connect)
 		}
 
-		out[i].Connect = &structs.ConsulConnect{
-			Native: s.Connect.Native,
-		}
+	}
 
-		if s.Connect.SidecarService == nil {
-			continue
-		}
+	return out
+}
 
-		out[i].Connect.SidecarService = &structs.ConsulSidecarService{
-			Port: s.Connect.SidecarService.Port,
-		}
+func ApiConsulConnectToStructs(in *api.ConsulConnect) *structs.ConsulConnect {
+	if in == nil {
+		return nil
+	}
 
-		if s.Connect.SidecarService.Proxy == nil {
-			continue
-		}
+	out := &structs.ConsulConnect{
+		Native: in.Native,
+	}
+
+	if in.SidecarService != nil {
 
-		out[i].Connect.SidecarService.Proxy = &structs.ConsulProxy{
-			Config: s.Connect.SidecarService.Proxy.Config,
+		out.SidecarService = &structs.ConsulSidecarService{
+			Port: in.SidecarService.Port,
 		}
 
-		upstreams := make([]*structs.ConsulUpstream, len(s.Connect.SidecarService.Proxy.Upstreams))
-		for i, p := range s.Connect.SidecarService.Proxy.Upstreams {
-			upstreams[i] = &structs.ConsulUpstream{
-				DestinationName: p.DestinationName,
-				LocalBindPort:   p.LocalBindPort,
+		if in.SidecarService.Proxy != nil {
+
+			out.SidecarService.Proxy = &structs.ConsulProxy{
+				Config: in.SidecarService.Proxy.Config,
 			}
+
+			upstreams := make([]structs.ConsulUpstream, len(in.SidecarService.Proxy.Upstreams))
+			for i, p := range in.SidecarService.Proxy.Upstreams {
+				upstreams[i] = structs.ConsulUpstream{
+					DestinationName: p.DestinationName,
+					LocalBindPort:   p.LocalBindPort,
+				}
+			}
+
+			out.SidecarService.Proxy.Upstreams = upstreams
 		}
+	}
 
-		out[i].Connect.SidecarService.Proxy.Upstreams = upstreams
+	if in.SidecarTask != nil {
+		ApiTaskToStructsTask(in.SidecarTask, out.SidecarTask)
 	}
 
 	return out