github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #3170 from thaJeztah/unkeyed_fields

Browse Source 
do not use unkeyed fields in composite literals
This commit is contained in:
Michael Crosby 2019-04-03 16:59:14 -04:00 committed by GitHub
commit fdeb1084d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/v2/runc/v1/service.go
View File

@ -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
}

4
runtime/v2/runc/v2/service.go
View File

@ -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
}

4
runtime/v2/runhcs/service.go
View File

@ -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