Merge pull request #3170 from thaJeztah/unkeyed_fields

crosbymichael · web-flow · commit fdeb1084d324 · 2019-04-03T16:59:14.000-04:00
do not use unkeyed fields in composite literals
diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go
@@ -377,7 +377,7 @@ func (s *service) Pause(ctx context.Context, r *taskAPI.PauseRequest) (*ptypes.E
 		return nil, errdefs.ToGRPC(err)
 	}
 	s.send(&eventstypes.TaskPaused{
-		container.ID,
+		ContainerID: container.ID,
 	})
 	return empty, nil
 }
@@ -392,7 +392,7 @@ func (s *service) Resume(ctx context.Context, r *taskAPI.ResumeRequest) (*ptypes
 		return nil, errdefs.ToGRPC(err)
 	}
 	s.send(&eventstypes.TaskResumed{
-		container.ID,
+		ContainerID: container.ID,
 	})
 	return empty, nil
 }
diff --git a/runtime/v2/runc/v2/service.go b/runtime/v2/runc/v2/service.go
@@ -430,7 +430,7 @@ func (s *service) Pause(ctx context.Context, r *taskAPI.PauseRequest) (*ptypes.E
 		return nil, errdefs.ToGRPC(err)
 	}
 	s.send(&eventstypes.TaskPaused{
-		container.ID,
+		ContainerID: container.ID,
 	})
 	return empty, nil
 }
@@ -445,7 +445,7 @@ func (s *service) Resume(ctx context.Context, r *taskAPI.ResumeRequest) (*ptypes
 		return nil, errdefs.ToGRPC(err)
 	}
 	s.send(&eventstypes.TaskResumed{
-		container.ID,
+		ContainerID: container.ID,
 	})
 	return empty, nil
 }
diff --git a/runtime/v2/runhcs/service.go b/runtime/v2/runhcs/service.go
@@ -832,7 +832,7 @@ func (s *service) Pause(ctx context.Context, r *taskAPI.PauseRequest) (*ptypes.E
 	}
 
 	s.publisher.Publish(ctx, runtime.TaskPausedEventTopic, &eventstypes.TaskPaused{
-		r.ID,
+		ContainerID: r.ID,
 	})
 
 	return empty, nil
@@ -855,7 +855,7 @@ func (s *service) Resume(ctx context.Context, r *taskAPI.ResumeRequest) (*ptypes
 	}
 
 	s.publisher.Publish(ctx, runtime.TaskResumedEventTopic, &eventstypes.TaskResumed{
-		r.ID,
+		ContainerID: r.ID,
 	})
 
 	return empty, nil

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ func (s service) Pause(ctx context.Context, r taskAPI.PauseRequest) (*ptypes.E`
`377`	`377`	`return nil, errdefs.ToGRPC(err)`
`378`	`378`	`}`
`379`	`379`	`s.send(&eventstypes.TaskPaused{`
`380`		`- container.ID,`
	`380`	`+ ContainerID: container.ID,`
`381`	`381`	`})`
`382`	`382`	`return empty, nil`
`383`	`383`	`}`
`@@ -392,7 +392,7 @@ func (s service) Resume(ctx context.Context, r taskAPI.ResumeRequest) (*ptypes`
`392`	`392`	`return nil, errdefs.ToGRPC(err)`
`393`	`393`	`}`
`394`	`394`	`s.send(&eventstypes.TaskResumed{`
`395`		`- container.ID,`
	`395`	`+ ContainerID: container.ID,`
`396`	`396`	`})`
`397`	`397`	`return empty, nil`
`398`	`398`	`}`
Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ func (s service) Pause(ctx context.Context, r taskAPI.PauseRequest) (*ptypes.E`
`430`	`430`	`return nil, errdefs.ToGRPC(err)`
`431`	`431`	`}`
`432`	`432`	`s.send(&eventstypes.TaskPaused{`
`433`		`- container.ID,`
	`433`	`+ ContainerID: container.ID,`
`434`	`434`	`})`
`435`	`435`	`return empty, nil`
`436`	`436`	`}`
`@@ -445,7 +445,7 @@ func (s service) Resume(ctx context.Context, r taskAPI.ResumeRequest) (*ptypes`
`445`	`445`	`return nil, errdefs.ToGRPC(err)`
`446`	`446`	`}`
`447`	`447`	`s.send(&eventstypes.TaskResumed{`
`448`		`- container.ID,`
	`448`	`+ ContainerID: container.ID,`
`449`	`449`	`})`
`450`	`450`	`return empty, nil`
`451`	`451`	`}`
Original file line number	Diff line number	Diff line change
`@@ -832,7 +832,7 @@ func (s service) Pause(ctx context.Context, r taskAPI.PauseRequest) (*ptypes.E`
`832`	`832`	`}`
`833`	`833`
`834`	`834`	`s.publisher.Publish(ctx, runtime.TaskPausedEventTopic, &eventstypes.TaskPaused{`
`835`		`- r.ID,`
	`835`	`+ ContainerID: r.ID,`
`836`	`836`	`})`
`837`	`837`
`838`	`838`	`return empty, nil`
`@@ -855,7 +855,7 @@ func (s service) Resume(ctx context.Context, r taskAPI.ResumeRequest) (*ptypes`
`855`	`855`	`}`
`856`	`856`
`857`	`857`	`s.publisher.Publish(ctx, runtime.TaskResumedEventTopic, &eventstypes.TaskResumed{`
`858`		`- r.ID,`
	`858`	`+ ContainerID: r.ID,`
`859`	`859`	`})`
`860`	`860`
`861`	`861`	`return empty, nil`