From d9a2f40463d4d0b13b74489b15965e1d539821e0 Mon Sep 17 00:00:00 2001 From: Stephen J Day Date: Fri, 2 Dec 2016 16:04:13 -0800 Subject: [PATCH] api/execution: use Empty well-known type Signed-off-by: Stephen J Day --- api/execution/container.pb.go | 152 ++++++++-------- api/execution/container.proto | 12 +- api/execution/empty.pb.go | 317 ---------------------------------- api/execution/empty.proto | 8 - api/execution/execution.pb.go | 64 +++---- api/execution/execution.proto | 4 +- api/execution/gen.go | 2 +- 7 files changed, 118 insertions(+), 441 deletions(-) delete mode 100644 api/execution/empty.pb.go delete mode 100644 api/execution/empty.proto diff --git a/api/execution/container.pb.go b/api/execution/container.pb.go index 1191cb0..d04813d 100644 --- a/api/execution/container.pb.go +++ b/api/execution/container.pb.go @@ -7,6 +7,7 @@ package execution import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" +import google_protobuf "github.com/golang/protobuf/ptypes/empty" import _ "github.com/gogo/protobuf/gogoproto" import strings "strings" @@ -506,14 +507,14 @@ const _ = grpc.SupportPackageIsVersion4 type ContainerServiceClient interface { Get(ctx context.Context, in *GetContainerRequest, opts ...grpc.CallOption) (*GetContainerResponse, error) - Update(ctx context.Context, in *UpdateContainerRequest, opts ...grpc.CallOption) (*Empty, error) - Pause(ctx context.Context, in *PauseContainerRequest, opts ...grpc.CallOption) (*Empty, error) - Resume(ctx context.Context, in *ResumeContainerRequest, opts ...grpc.CallOption) (*Empty, error) + Update(ctx context.Context, in *UpdateContainerRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) + Pause(ctx context.Context, in *PauseContainerRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) + Resume(ctx context.Context, in *ResumeContainerRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) CreateProcess(ctx context.Context, in *CreateProcessRequest, opts ...grpc.CallOption) (*CreateProcessResponse, error) GetProcess(ctx context.Context, in *GetProcessRequest, opts ...grpc.CallOption) (*GetProcessResponse, error) StartProcess(ctx context.Context, in *StartProcessRequest, opts ...grpc.CallOption) (*StartProcessResponse, error) - SignalProcess(ctx context.Context, in *SignalProcessRequest, opts ...grpc.CallOption) (*Empty, error) - DeleteProcess(ctx context.Context, in *DeleteProcessRequest, opts ...grpc.CallOption) (*Empty, error) + SignalProcess(ctx context.Context, in *SignalProcessRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) + DeleteProcess(ctx context.Context, in *DeleteProcessRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) ListProcesses(ctx context.Context, in *ListProcessesRequest, opts ...grpc.CallOption) (*ListProcessesResponse, error) } @@ -534,8 +535,8 @@ func (c *containerServiceClient) Get(ctx context.Context, in *GetContainerReques return out, nil } -func (c *containerServiceClient) Update(ctx context.Context, in *UpdateContainerRequest, opts ...grpc.CallOption) (*Empty, error) { - out := new(Empty) +func (c *containerServiceClient) Update(ctx context.Context, in *UpdateContainerRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) { + out := new(google_protobuf.Empty) err := grpc.Invoke(ctx, "/containerd.v1.ContainerService/Update", in, out, c.cc, opts...) if err != nil { return nil, err @@ -543,8 +544,8 @@ func (c *containerServiceClient) Update(ctx context.Context, in *UpdateContainer return out, nil } -func (c *containerServiceClient) Pause(ctx context.Context, in *PauseContainerRequest, opts ...grpc.CallOption) (*Empty, error) { - out := new(Empty) +func (c *containerServiceClient) Pause(ctx context.Context, in *PauseContainerRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) { + out := new(google_protobuf.Empty) err := grpc.Invoke(ctx, "/containerd.v1.ContainerService/Pause", in, out, c.cc, opts...) if err != nil { return nil, err @@ -552,8 +553,8 @@ func (c *containerServiceClient) Pause(ctx context.Context, in *PauseContainerRe return out, nil } -func (c *containerServiceClient) Resume(ctx context.Context, in *ResumeContainerRequest, opts ...grpc.CallOption) (*Empty, error) { - out := new(Empty) +func (c *containerServiceClient) Resume(ctx context.Context, in *ResumeContainerRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) { + out := new(google_protobuf.Empty) err := grpc.Invoke(ctx, "/containerd.v1.ContainerService/Resume", in, out, c.cc, opts...) if err != nil { return nil, err @@ -588,8 +589,8 @@ func (c *containerServiceClient) StartProcess(ctx context.Context, in *StartProc return out, nil } -func (c *containerServiceClient) SignalProcess(ctx context.Context, in *SignalProcessRequest, opts ...grpc.CallOption) (*Empty, error) { - out := new(Empty) +func (c *containerServiceClient) SignalProcess(ctx context.Context, in *SignalProcessRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) { + out := new(google_protobuf.Empty) err := grpc.Invoke(ctx, "/containerd.v1.ContainerService/SignalProcess", in, out, c.cc, opts...) if err != nil { return nil, err @@ -597,8 +598,8 @@ func (c *containerServiceClient) SignalProcess(ctx context.Context, in *SignalPr return out, nil } -func (c *containerServiceClient) DeleteProcess(ctx context.Context, in *DeleteProcessRequest, opts ...grpc.CallOption) (*Empty, error) { - out := new(Empty) +func (c *containerServiceClient) DeleteProcess(ctx context.Context, in *DeleteProcessRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) { + out := new(google_protobuf.Empty) err := grpc.Invoke(ctx, "/containerd.v1.ContainerService/DeleteProcess", in, out, c.cc, opts...) if err != nil { return nil, err @@ -619,14 +620,14 @@ func (c *containerServiceClient) ListProcesses(ctx context.Context, in *ListProc type ContainerServiceServer interface { Get(context.Context, *GetContainerRequest) (*GetContainerResponse, error) - Update(context.Context, *UpdateContainerRequest) (*Empty, error) - Pause(context.Context, *PauseContainerRequest) (*Empty, error) - Resume(context.Context, *ResumeContainerRequest) (*Empty, error) + Update(context.Context, *UpdateContainerRequest) (*google_protobuf.Empty, error) + Pause(context.Context, *PauseContainerRequest) (*google_protobuf.Empty, error) + Resume(context.Context, *ResumeContainerRequest) (*google_protobuf.Empty, error) CreateProcess(context.Context, *CreateProcessRequest) (*CreateProcessResponse, error) GetProcess(context.Context, *GetProcessRequest) (*GetProcessResponse, error) StartProcess(context.Context, *StartProcessRequest) (*StartProcessResponse, error) - SignalProcess(context.Context, *SignalProcessRequest) (*Empty, error) - DeleteProcess(context.Context, *DeleteProcessRequest) (*Empty, error) + SignalProcess(context.Context, *SignalProcessRequest) (*google_protobuf.Empty, error) + DeleteProcess(context.Context, *DeleteProcessRequest) (*google_protobuf.Empty, error) ListProcesses(context.Context, *ListProcessesRequest) (*ListProcessesResponse, error) } @@ -4126,59 +4127,60 @@ var ( func init() { proto.RegisterFile("container.proto", fileDescriptorContainer) } var fileDescriptorContainer = []byte{ - // 855 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x56, 0xd1, 0x72, 0xf2, 0x44, - 0x14, 0x6e, 0x80, 0x86, 0xe6, 0xf0, 0xe7, 0x17, 0xb7, 0x81, 0xc9, 0x30, 0xca, 0xcf, 0x1f, 0xab, - 0x32, 0xce, 0x94, 0x56, 0x74, 0xbc, 0xf1, 0xaa, 0x05, 0x44, 0x3a, 0x8a, 0xb8, 0x94, 0x71, 0xc6, - 0x1b, 0x4c, 0xc9, 0x0e, 0x8d, 0x43, 0x13, 0x9a, 0x6c, 0xaa, 0xde, 0xf5, 0x65, 0x7c, 0x80, 0xbe, - 0x45, 0x2f, 0xbd, 0xf4, 0xca, 0xb1, 0x3c, 0x81, 0x8f, 0xe0, 0x6c, 0xb2, 0x04, 0x48, 0x02, 0x3f, - 0xa5, 0x77, 0x67, 0x0f, 0x67, 0xbf, 0xfd, 0xce, 0xb7, 0xfb, 0x1d, 0x02, 0xef, 0x8d, 0x6c, 0x8b, - 0xea, 0xa6, 0x45, 0x9c, 0xda, 0xd4, 0xb1, 0xa9, 0x8d, 0xe4, 0x30, 0x61, 0xd4, 0xee, 0x3e, 0x2f, - 0xe5, 0xc8, 0xcd, 0x94, 0xfe, 0x11, 0xfc, 0x56, 0x52, 0xc6, 0xf6, 0xd8, 0xf6, 0xc3, 0x13, 0x16, - 0x05, 0x59, 0xed, 0x41, 0x00, 0xa5, 0xe1, 0x10, 0x9d, 0x92, 0x9e, 0x63, 0x8f, 0x88, 0xeb, 0x62, - 0x72, 0xeb, 0x11, 0x97, 0xa2, 0xb7, 0xf0, 0x2a, 0x04, 0x1b, 0x9a, 0x86, 0x2a, 0x54, 0x84, 0xaa, - 0x84, 0x73, 0x61, 0xae, 0x63, 0xa0, 0x53, 0xc8, 0x4e, 0x83, 0x4d, 0x6a, 0xaa, 0x22, 0x54, 0x73, - 0xf5, 0x62, 0x6d, 0xe5, 0xfc, 0xda, 0x1c, 0x72, 0x5e, 0x86, 0x14, 0xd8, 0x77, 0xa9, 0x61, 0x5a, - 0x6a, 0xda, 0x47, 0x0b, 0x16, 0xa8, 0x08, 0xa2, 0x4b, 0x0d, 0xdb, 0xa3, 0x6a, 0xc6, 0x4f, 0xf3, - 0x15, 0xcf, 0x13, 0xc7, 0x51, 0xf7, 0xc3, 0x3c, 0x71, 0x1c, 0xad, 0x03, 0x85, 0x08, 0x65, 0x77, - 0x6a, 0x5b, 0x2e, 0x59, 0x26, 0x24, 0x6c, 0x45, 0x48, 0xfb, 0x53, 0x00, 0xa9, 0x31, 0x2f, 0x41, - 0x45, 0x48, 0xcd, 0x3b, 0x3d, 0x17, 0x67, 0xff, 0xbc, 0x49, 0x75, 0x9a, 0x38, 0x65, 0x1a, 0xe8, - 0x0d, 0xe4, 0xae, 0x3c, 0xcb, 0x98, 0x90, 0xe1, 0x54, 0xa7, 0xd7, 0x7e, 0xb3, 0x12, 0x86, 0x20, - 0xd5, 0xd3, 0xe9, 0xf5, 0xf2, 0xc1, 0xe9, 0xed, 0x94, 0x38, 0x66, 0xbd, 0xe9, 0xd4, 0x73, 0xfd, - 0x9e, 0x5f, 0xd7, 0x0b, 0x91, 0x0d, 0x7d, 0xff, 0x47, 0xcc, 0x8b, 0xb4, 0xfb, 0x14, 0x64, 0x39, - 0xc6, 0x5a, 0x96, 0x79, 0x48, 0x4f, 0x4d, 0xc3, 0x67, 0x97, 0xc1, 0x2c, 0x44, 0x08, 0x32, 0xba, - 0x33, 0x66, 0x9c, 0xd2, 0x55, 0x09, 0xfb, 0x31, 0xab, 0x22, 0xd6, 0x9d, 0x9a, 0xf1, 0x53, 0x2c, - 0x44, 0x9f, 0x42, 0xc6, 0x73, 0x49, 0x20, 0x72, 0xae, 0x7e, 0x18, 0x21, 0x32, 0x70, 0x89, 0x83, - 0xfd, 0x02, 0xb6, 0x75, 0xf4, 0x9b, 0xa1, 0x8a, 0x7e, 0xfb, 0x2c, 0x44, 0x25, 0x38, 0xa0, 0xc4, - 0xb9, 0x31, 0x2d, 0x7d, 0xa2, 0x66, 0x2b, 0x42, 0xf5, 0x00, 0x87, 0xeb, 0xa5, 0x0e, 0x0f, 0xb6, - 0xe8, 0x90, 0x69, 0x4c, 0x7e, 0x37, 0xe9, 0x90, 0xef, 0x91, 0x2a, 0x42, 0x55, 0xc6, 0xc0, 0x52, - 0x41, 0xa1, 0x86, 0x21, 0x33, 0xe0, 0x2c, 0x3c, 0xde, 0xbf, 0x8c, 0x59, 0xc8, 0x32, 0x63, 0xde, - 0xb8, 0x8c, 0x59, 0x88, 0x3e, 0x81, 0xd7, 0xba, 0x61, 0x98, 0xd4, 0xb4, 0x2d, 0x7d, 0xd2, 0x36, - 0x8d, 0x40, 0x02, 0x19, 0x47, 0xb2, 0xda, 0x31, 0x1c, 0xb6, 0x09, 0x0d, 0x1f, 0xc0, 0xfc, 0xed, - 0xaf, 0x51, 0x58, 0xeb, 0x82, 0xb2, 0x5a, 0xce, 0xdf, 0xdd, 0x57, 0x20, 0x85, 0xbd, 0xf1, 0x97, - 0xa7, 0x46, 0xba, 0x5d, 0x6c, 0x5a, 0x94, 0x6a, 0xb7, 0x50, 0x1c, 0x4c, 0x0d, 0x9d, 0x92, 0x18, - 0x83, 0x1d, 0x11, 0xdf, 0xf9, 0x52, 0xb5, 0x13, 0x28, 0xf4, 0x74, 0xcf, 0x25, 0x5b, 0xf7, 0x7c, - 0x0a, 0x45, 0x4c, 0x5c, 0xef, 0x66, 0xfb, 0x1d, 0x6d, 0x38, 0xec, 0x53, 0xdd, 0xa1, 0x91, 0x81, - 0xf2, 0x7c, 0x73, 0x7e, 0x0b, 0xca, 0x2a, 0xd0, 0xce, 0x36, 0xff, 0x15, 0xde, 0x6f, 0x93, 0x28, - 0xa1, 0x5d, 0x35, 0xfe, 0x10, 0x80, 0xe3, 0x0e, 0xf9, 0xab, 0x93, 0xb0, 0xc4, 0x33, 0x1d, 0x43, - 0xfb, 0x06, 0xd0, 0xf2, 0x59, 0x3b, 0x73, 0xfe, 0x05, 0x94, 0xbe, 0x39, 0xb6, 0xf4, 0xc9, 0x4b, - 0x75, 0xf4, 0xe7, 0xa8, 0x8f, 0xc4, 0x2d, 0xc2, 0x57, 0x4c, 0xdf, 0x26, 0x99, 0x90, 0xd8, 0xe8, - 0x7f, 0x3e, 0xd7, 0x2e, 0x28, 0xdf, 0x99, 0xee, 0xbc, 0x69, 0xf2, 0x52, 0x89, 0xb5, 0xef, 0xa1, - 0x10, 0xc1, 0xe3, 0x32, 0x7e, 0x09, 0x73, 0xa5, 0x09, 0x23, 0x97, 0xde, 0x40, 0x6e, 0x51, 0xf8, - 0xd9, 0xd7, 0x20, 0x06, 0x43, 0x04, 0xe5, 0x20, 0xdb, 0xc0, 0xad, 0xb3, 0xcb, 0x56, 0x33, 0xbf, - 0xc7, 0x16, 0x78, 0xd0, 0xed, 0x76, 0xba, 0xed, 0xbc, 0xc0, 0x16, 0xfd, 0xcb, 0x1f, 0x7a, 0xbd, - 0x56, 0x33, 0x9f, 0x42, 0x00, 0x62, 0xef, 0x6c, 0xd0, 0x6f, 0x35, 0xf3, 0xe9, 0xfa, 0x83, 0x08, - 0xf9, 0x90, 0x64, 0x9f, 0x38, 0x77, 0xe6, 0x88, 0xa0, 0x2e, 0xa4, 0xdb, 0x84, 0x22, 0x2d, 0x72, - 0x76, 0xc2, 0x30, 0x29, 0x7d, 0xb4, 0xb1, 0x86, 0xf7, 0xd5, 0x02, 0x31, 0x98, 0x04, 0xe8, 0xe3, - 0xe8, 0xfc, 0x4d, 0x1c, 0x10, 0x25, 0x25, 0x52, 0xd6, 0x62, 0xff, 0xf4, 0xa8, 0x01, 0xfb, 0xbe, - 0xbb, 0xd1, 0x51, 0x54, 0x94, 0x24, 0xcf, 0xaf, 0x01, 0x69, 0x81, 0x18, 0x38, 0x3e, 0xc6, 0x25, - 0x79, 0x10, 0xac, 0x81, 0xf9, 0x19, 0xe4, 0x95, 0x7f, 0x69, 0x14, 0x15, 0x22, 0xe9, 0xb3, 0xa3, - 0x74, 0xb4, 0xb9, 0x88, 0xcb, 0xf5, 0x23, 0xc0, 0xc2, 0x63, 0xa8, 0x12, 0x57, 0x38, 0x82, 0xfa, - 0x76, 0x43, 0x05, 0x87, 0xfc, 0x09, 0x5e, 0x2d, 0x0f, 0x9b, 0xd8, 0xd5, 0x26, 0x8c, 0xb4, 0xd8, - 0xd5, 0x26, 0x4e, 0xab, 0x0b, 0x90, 0x57, 0x7c, 0x1c, 0xd3, 0x21, 0xc9, 0xe5, 0x6b, 0x34, 0xbd, - 0x00, 0x79, 0xc5, 0xb1, 0x31, 0xac, 0x24, 0x3f, 0xaf, 0xbf, 0x9f, 0x15, 0x8f, 0xc5, 0xb0, 0x92, - 0x1c, 0x1d, 0xbb, 0x9f, 0x44, 0x9b, 0x9e, 0x7f, 0xf0, 0xf8, 0x54, 0xde, 0xfb, 0xfb, 0xa9, 0xbc, - 0xf7, 0xdf, 0x53, 0x59, 0xb8, 0x9f, 0x95, 0x85, 0xc7, 0x59, 0x59, 0xf8, 0x6b, 0x56, 0x16, 0xfe, - 0x9d, 0x95, 0x85, 0x2b, 0xd1, 0xff, 0xf4, 0xfc, 0xe2, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc7, - 0xae, 0x17, 0x04, 0xbf, 0x0a, 0x00, 0x00, + // 873 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x56, 0x41, 0x93, 0xe2, 0x44, + 0x14, 0x9e, 0x00, 0x13, 0x26, 0x8f, 0xcd, 0x8a, 0x3d, 0x40, 0xa5, 0x50, 0x59, 0x36, 0xae, 0x4a, + 0x59, 0xb5, 0xb0, 0xa2, 0xe5, 0xc5, 0xd3, 0xee, 0x80, 0x91, 0xaa, 0x11, 0xb1, 0x59, 0xca, 0x2a, + 0x2f, 0x98, 0x21, 0x2d, 0x1b, 0x8b, 0x49, 0xd8, 0xa4, 0x33, 0xea, 0x6d, 0xff, 0x8c, 0x3f, 0xc0, + 0xb3, 0x7f, 0x60, 0x8f, 0x1e, 0x3d, 0x59, 0x0e, 0xbf, 0xc0, 0x9f, 0x60, 0x75, 0xa7, 0x13, 0x20, + 0x09, 0xc8, 0x32, 0xb7, 0xd7, 0x8f, 0xd7, 0x5f, 0xbe, 0xf7, 0x75, 0x7f, 0xaf, 0x81, 0xb7, 0x66, + 0xae, 0x43, 0x4d, 0xdb, 0x21, 0x5e, 0x7b, 0xe9, 0xb9, 0xd4, 0x45, 0x6a, 0x9c, 0xb0, 0xda, 0x37, + 0x9f, 0xd4, 0xdf, 0x99, 0xbb, 0xee, 0x7c, 0x41, 0x3a, 0xfc, 0xc7, 0xab, 0xe0, 0xc7, 0x0e, 0xb9, + 0x5e, 0xd2, 0x5f, 0xc3, 0xda, 0x7a, 0x65, 0xee, 0xce, 0x5d, 0x1e, 0x76, 0x58, 0x14, 0x66, 0xf5, + 0xdf, 0x25, 0xa8, 0x5c, 0x78, 0xc4, 0xa4, 0x64, 0xe4, 0xb9, 0x33, 0xe2, 0xfb, 0x98, 0xbc, 0x0c, + 0x88, 0x4f, 0xd1, 0x43, 0xb8, 0x17, 0x83, 0x4f, 0x6d, 0x4b, 0x93, 0x9a, 0x52, 0x4b, 0xc1, 0xa5, + 0x38, 0x37, 0xb0, 0xd0, 0x13, 0x28, 0x2e, 0xc3, 0x4d, 0x5a, 0xae, 0x29, 0xb5, 0x4a, 0xdd, 0x5a, + 0x7b, 0x8b, 0x4f, 0x3b, 0x82, 0x8c, 0xca, 0x50, 0x05, 0x4e, 0x7d, 0x6a, 0xd9, 0x8e, 0x96, 0xe7, + 0x68, 0xe1, 0x02, 0xd5, 0x40, 0xf6, 0xa9, 0xe5, 0x06, 0x54, 0x2b, 0xf0, 0xb4, 0x58, 0x89, 0x3c, + 0xf1, 0x3c, 0xed, 0x34, 0xce, 0x13, 0xcf, 0xd3, 0x07, 0x50, 0x4d, 0x50, 0xf6, 0x97, 0xae, 0xe3, + 0x93, 0x4d, 0x42, 0xd2, 0x41, 0x84, 0xf4, 0xdf, 0x24, 0x50, 0x2e, 0xa2, 0x12, 0x54, 0x83, 0x5c, + 0xd4, 0xe9, 0x33, 0x79, 0xf5, 0xf7, 0x83, 0xdc, 0xa0, 0x87, 0x73, 0xb6, 0x85, 0x1e, 0x40, 0xe9, + 0x2a, 0x70, 0xac, 0x05, 0x99, 0x2e, 0x4d, 0xfa, 0x82, 0x37, 0xab, 0x60, 0x08, 0x53, 0x23, 0x93, + 0xbe, 0xd8, 0xfc, 0x70, 0xfe, 0x30, 0x25, 0x1e, 0xb3, 0xde, 0x4c, 0x1a, 0xf8, 0xbc, 0xe7, 0xfb, + 0xdd, 0x6a, 0x62, 0xc3, 0x98, 0xff, 0x88, 0x45, 0x91, 0xfe, 0x2a, 0x07, 0x45, 0x81, 0xb1, 0x93, + 0x65, 0x19, 0xf2, 0x4b, 0xdb, 0xe2, 0xec, 0x0a, 0x98, 0x85, 0x08, 0x41, 0xc1, 0xf4, 0xe6, 0x8c, + 0x53, 0xbe, 0xa5, 0x60, 0x1e, 0xb3, 0x2a, 0xe2, 0xdc, 0x68, 0x05, 0x9e, 0x62, 0x21, 0xfa, 0x08, + 0x0a, 0x81, 0x4f, 0x42, 0x91, 0x4b, 0xdd, 0xf3, 0x04, 0x91, 0x89, 0x4f, 0x3c, 0xcc, 0x0b, 0xd8, + 0xd6, 0xd9, 0xcf, 0x96, 0x26, 0xf3, 0xf6, 0x59, 0x88, 0xea, 0x70, 0x46, 0x89, 0x77, 0x6d, 0x3b, + 0xe6, 0x42, 0x2b, 0x36, 0xa5, 0xd6, 0x19, 0x8e, 0xd7, 0x1b, 0x1d, 0x9e, 0x1d, 0xd0, 0x21, 0xd3, + 0x98, 0xfc, 0x62, 0xd3, 0xa9, 0xd8, 0xa3, 0x34, 0xa5, 0x96, 0x8a, 0x81, 0xa5, 0xc2, 0x42, 0x1d, + 0x43, 0x61, 0x22, 0x58, 0x04, 0xa2, 0x7f, 0x15, 0xb3, 0x90, 0x65, 0xe6, 0xa2, 0x71, 0x15, 0xb3, + 0x10, 0x7d, 0x08, 0xf7, 0x4d, 0xcb, 0xb2, 0xa9, 0xed, 0x3a, 0xe6, 0xc2, 0xb0, 0xad, 0x50, 0x02, + 0x15, 0x27, 0xb2, 0xfa, 0x63, 0x38, 0x37, 0x08, 0x8d, 0x2f, 0x40, 0x74, 0xf7, 0x77, 0x28, 0xac, + 0x0f, 0xa1, 0xb2, 0x5d, 0x2e, 0xee, 0xdd, 0xe7, 0xa0, 0xc4, 0xbd, 0x89, 0x9b, 0xa7, 0x25, 0xba, + 0x5d, 0x6f, 0x5a, 0x97, 0xea, 0x2f, 0xa1, 0x36, 0x59, 0x5a, 0x26, 0x25, 0x29, 0x06, 0x47, 0x22, + 0xfe, 0xef, 0x4d, 0xd5, 0x3b, 0x50, 0x1d, 0x99, 0x81, 0x4f, 0x0e, 0xee, 0xf9, 0x09, 0xd4, 0x30, + 0xf1, 0x83, 0xeb, 0xc3, 0x77, 0x18, 0x70, 0x3e, 0xa6, 0xa6, 0x47, 0x13, 0x03, 0xe5, 0xcd, 0xcd, + 0xf9, 0x15, 0x54, 0xb6, 0x81, 0x8e, 0xb6, 0xf9, 0x4f, 0xf0, 0xb6, 0x41, 0x92, 0x84, 0x8e, 0xd5, + 0xf8, 0x3d, 0x00, 0x81, 0x3b, 0x15, 0xb7, 0x4e, 0xc1, 0x8a, 0xc8, 0x0c, 0x2c, 0xfd, 0x4b, 0x40, + 0x9b, 0xdf, 0x3a, 0x9a, 0xf3, 0x0f, 0x50, 0x19, 0xdb, 0x73, 0xc7, 0x5c, 0xdc, 0x55, 0x47, 0x3e, + 0x47, 0x39, 0x92, 0xb0, 0x88, 0x58, 0x31, 0x7d, 0x7b, 0x64, 0x41, 0x52, 0xa3, 0xff, 0xcd, 0xb9, + 0x0e, 0xa1, 0x72, 0x69, 0xfb, 0x51, 0xd3, 0xe4, 0xae, 0x12, 0xeb, 0x5f, 0x43, 0x35, 0x81, 0x27, + 0x64, 0xfc, 0x0c, 0x22, 0xa5, 0x09, 0x23, 0x97, 0xdf, 0x43, 0x6e, 0x5d, 0xf8, 0xf1, 0x17, 0x20, + 0x87, 0x43, 0x04, 0x95, 0xa0, 0x78, 0x81, 0xfb, 0x4f, 0x9f, 0xf7, 0x7b, 0xe5, 0x13, 0xb6, 0xc0, + 0x93, 0xe1, 0x70, 0x30, 0x34, 0xca, 0x12, 0x5b, 0x8c, 0x9f, 0x7f, 0x33, 0x1a, 0xf5, 0x7b, 0xe5, + 0x1c, 0x02, 0x90, 0x47, 0x4f, 0x27, 0xe3, 0x7e, 0xaf, 0x9c, 0xef, 0xfe, 0x21, 0x43, 0x39, 0x26, + 0x39, 0x26, 0xde, 0x8d, 0x3d, 0x23, 0x68, 0x08, 0x79, 0x83, 0x50, 0xa4, 0x27, 0xbe, 0x9d, 0x31, + 0x4c, 0xea, 0xef, 0xef, 0xad, 0x11, 0x7d, 0x19, 0x20, 0x87, 0x93, 0x00, 0x7d, 0x90, 0x9c, 0xbf, + 0x99, 0x03, 0xa2, 0x5e, 0x6b, 0x87, 0x6f, 0x7d, 0x3b, 0x7a, 0xeb, 0xdb, 0x7d, 0xf6, 0xd6, 0xa3, + 0x3e, 0x9c, 0x72, 0x7f, 0xa3, 0x47, 0x49, 0x59, 0xb2, 0x5c, 0xbf, 0x13, 0xc6, 0x00, 0x39, 0x74, + 0x7d, 0x8a, 0x4f, 0xf6, 0x30, 0xd8, 0x09, 0xf4, 0x3d, 0xa8, 0x5b, 0x6f, 0x35, 0x4a, 0xca, 0x91, + 0xf5, 0xe7, 0xa3, 0xfe, 0x68, 0x7f, 0x91, 0x10, 0xed, 0x5b, 0x80, 0xb5, 0xd3, 0x50, 0x33, 0xad, + 0x73, 0x02, 0xf5, 0xe1, 0x9e, 0x0a, 0x01, 0xf9, 0x1d, 0xdc, 0xdb, 0x1c, 0x39, 0xa9, 0x03, 0xce, + 0x18, 0x6c, 0xa9, 0x03, 0xce, 0x9c, 0x59, 0x97, 0xa0, 0x6e, 0xb9, 0x39, 0xa5, 0x43, 0x96, 0xd7, + 0x77, 0xaa, 0x7a, 0x09, 0xea, 0x96, 0x73, 0x53, 0x68, 0x59, 0xbe, 0xde, 0x77, 0x46, 0x5b, 0x6e, + 0x4b, 0xa1, 0x65, 0x79, 0x3b, 0x75, 0x46, 0x99, 0x86, 0x7d, 0xf6, 0xee, 0xeb, 0xdb, 0xc6, 0xc9, + 0x5f, 0xb7, 0x8d, 0x93, 0x7f, 0x6f, 0x1b, 0xd2, 0xab, 0x55, 0x43, 0x7a, 0xbd, 0x6a, 0x48, 0x7f, + 0xae, 0x1a, 0xd2, 0x3f, 0xab, 0x86, 0x74, 0x25, 0x73, 0x26, 0x9f, 0xfe, 0x17, 0x00, 0x00, 0xff, + 0xff, 0x9f, 0x3d, 0x76, 0x6b, 0xd9, 0x0a, 0x00, 0x00, } diff --git a/api/execution/container.proto b/api/execution/container.proto index 764b9ee..c726faa 100644 --- a/api/execution/container.proto +++ b/api/execution/container.proto @@ -2,20 +2,20 @@ syntax = "proto3"; package containerd.v1; -import "empty.proto"; +import "google/protobuf/empty.proto"; import "gogoproto/gogo.proto"; service ContainerService { rpc Get(GetContainerRequest) returns (GetContainerResponse); - rpc Update(UpdateContainerRequest) returns (Empty); - rpc Pause(PauseContainerRequest) returns (Empty); - rpc Resume(ResumeContainerRequest) returns (Empty); + rpc Update(UpdateContainerRequest) returns (google.protobuf.Empty); + rpc Pause(PauseContainerRequest) returns (google.protobuf.Empty); + rpc Resume(ResumeContainerRequest) returns (google.protobuf.Empty); rpc CreateProcess(CreateProcessRequest) returns (CreateProcessResponse); rpc GetProcess(GetProcessRequest) returns (GetProcessResponse); rpc StartProcess(StartProcessRequest) returns (StartProcessResponse); - rpc SignalProcess(SignalProcessRequest) returns (Empty); - rpc DeleteProcess(DeleteProcessRequest) returns (Empty); + rpc SignalProcess(SignalProcessRequest) returns (google.protobuf.Empty); + rpc DeleteProcess(DeleteProcessRequest) returns (google.protobuf.Empty); rpc ListProcesses(ListProcessesRequest) returns (ListProcessesResponse); } diff --git a/api/execution/empty.pb.go b/api/execution/empty.pb.go deleted file mode 100644 index 60b6b15..0000000 --- a/api/execution/empty.pb.go +++ /dev/null @@ -1,317 +0,0 @@ -// Code generated by protoc-gen-gogo. -// source: empty.proto -// DO NOT EDIT! - -package execution - -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" - -import strings "strings" -import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto" -import sort "sort" -import strconv "strconv" -import reflect "reflect" - -import io "io" - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -type Empty struct { -} - -func (m *Empty) Reset() { *m = Empty{} } -func (*Empty) ProtoMessage() {} -func (*Empty) Descriptor() ([]byte, []int) { return fileDescriptorEmpty, []int{0} } - -func init() { - proto.RegisterType((*Empty)(nil), "containerd.v1.Empty") -} -func (this *Empty) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 4) - s = append(s, "&execution.Empty{") - s = append(s, "}") - return strings.Join(s, "") -} -func valueToGoStringEmpty(v interface{}, typ string) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) -} -func extensionToGoStringEmpty(m github_com_gogo_protobuf_proto.Message) string { - e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m) - if e == nil { - return "nil" - } - s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{" - keys := make([]int, 0, len(e)) - for k := range e { - keys = append(keys, int(k)) - } - sort.Ints(keys) - ss := []string{} - for _, k := range keys { - ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString()) - } - s += strings.Join(ss, ",") + "})" - return s -} -func (m *Empty) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Empty) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - return i, nil -} - -func encodeFixed64Empty(dAtA []byte, offset int, v uint64) int { - dAtA[offset] = uint8(v) - dAtA[offset+1] = uint8(v >> 8) - dAtA[offset+2] = uint8(v >> 16) - dAtA[offset+3] = uint8(v >> 24) - dAtA[offset+4] = uint8(v >> 32) - dAtA[offset+5] = uint8(v >> 40) - dAtA[offset+6] = uint8(v >> 48) - dAtA[offset+7] = uint8(v >> 56) - return offset + 8 -} -func encodeFixed32Empty(dAtA []byte, offset int, v uint32) int { - dAtA[offset] = uint8(v) - dAtA[offset+1] = uint8(v >> 8) - dAtA[offset+2] = uint8(v >> 16) - dAtA[offset+3] = uint8(v >> 24) - return offset + 4 -} -func encodeVarintEmpty(dAtA []byte, offset int, v uint64) int { - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return offset + 1 -} -func (m *Empty) Size() (n int) { - var l int - _ = l - return n -} - -func sovEmpty(x uint64) (n int) { - for { - n++ - x >>= 7 - if x == 0 { - break - } - } - return n -} -func sozEmpty(x uint64) (n int) { - return sovEmpty(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (this *Empty) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&Empty{`, - `}`, - }, "") - return s -} -func valueToStringEmpty(v interface{}) string { - rv := reflect.ValueOf(v) - if rv.IsNil() { - return "nil" - } - pv := reflect.Indirect(rv).Interface() - return fmt.Sprintf("*%v", pv) -} -func (m *Empty) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEmpty - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Empty: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Empty: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipEmpty(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthEmpty - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipEmpty(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEmpty - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEmpty - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - return iNdEx, nil - case 1: - iNdEx += 8 - return iNdEx, nil - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEmpty - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - iNdEx += length - if length < 0 { - return 0, ErrInvalidLengthEmpty - } - return iNdEx, nil - case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEmpty - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipEmpty(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - } - return iNdEx, nil - case 4: - return iNdEx, nil - case 5: - iNdEx += 4 - return iNdEx, nil - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - } - panic("unreachable") -} - -var ( - ErrInvalidLengthEmpty = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowEmpty = fmt.Errorf("proto: integer overflow") -) - -func init() { proto.RegisterFile("empty.proto", fileDescriptorEmpty) } - -var fileDescriptorEmpty = []byte{ - // 108 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0x4e, 0xcd, 0x2d, 0x28, - 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x4d, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, - 0x4b, 0x2d, 0x4a, 0xd1, 0x2b, 0x33, 0x94, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xcb, 0xe8, 0x83, - 0x58, 0x10, 0x45, 0x4a, 0xec, 0x5c, 0xac, 0xae, 0x20, 0x3d, 0x4e, 0x32, 0x27, 0x1e, 0xca, 0x31, - 0xdc, 0x78, 0x28, 0xc7, 0xf0, 0xe1, 0xa1, 0x1c, 0x63, 0xc3, 0x23, 0x39, 0xc6, 0x13, 0x8f, 0xe4, - 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x31, 0x89, 0x0d, 0xac, 0xda, 0x18, 0x10, - 0x00, 0x00, 0xff, 0xff, 0xe0, 0x96, 0x22, 0x83, 0x61, 0x00, 0x00, 0x00, -} diff --git a/api/execution/empty.proto b/api/execution/empty.proto deleted file mode 100644 index 52dc51a..0000000 --- a/api/execution/empty.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -package containerd.v1; - -import "gogoproto/gogo.proto"; - -message Empty { -} diff --git a/api/execution/execution.pb.go b/api/execution/execution.pb.go index a1ef658..2df69ea 100644 --- a/api/execution/execution.pb.go +++ b/api/execution/execution.pb.go @@ -7,7 +7,6 @@ It is generated from these files: execution.proto - empty.proto container.proto It has these top-level messages: @@ -17,7 +16,6 @@ DeleteContainerResponse ListContainersRequest ListContainersResponse - Empty CreateProcessRequest CreateProcessResponse Container @@ -42,6 +40,7 @@ package execution import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" +import google_protobuf "github.com/golang/protobuf/ptypes/empty" import _ "github.com/gogo/protobuf/gogoproto" import strings "strings" @@ -233,7 +232,7 @@ const _ = grpc.SupportPackageIsVersion4 type ExecutionServiceClient interface { Create(ctx context.Context, in *CreateContainerRequest, opts ...grpc.CallOption) (*CreateContainerResponse, error) - Delete(ctx context.Context, in *DeleteContainerRequest, opts ...grpc.CallOption) (*Empty, error) + Delete(ctx context.Context, in *DeleteContainerRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) List(ctx context.Context, in *ListContainersRequest, opts ...grpc.CallOption) (*ListContainersResponse, error) } @@ -254,8 +253,8 @@ func (c *executionServiceClient) Create(ctx context.Context, in *CreateContainer return out, nil } -func (c *executionServiceClient) Delete(ctx context.Context, in *DeleteContainerRequest, opts ...grpc.CallOption) (*Empty, error) { - out := new(Empty) +func (c *executionServiceClient) Delete(ctx context.Context, in *DeleteContainerRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) { + out := new(google_protobuf.Empty) err := grpc.Invoke(ctx, "/containerd.v1.ExecutionService/Delete", in, out, c.cc, opts...) if err != nil { return nil, err @@ -276,7 +275,7 @@ func (c *executionServiceClient) List(ctx context.Context, in *ListContainersReq type ExecutionServiceServer interface { Create(context.Context, *CreateContainerRequest) (*CreateContainerResponse, error) - Delete(context.Context, *DeleteContainerRequest) (*Empty, error) + Delete(context.Context, *DeleteContainerRequest) (*google_protobuf.Empty, error) List(context.Context, *ListContainersRequest) (*ListContainersResponse, error) } @@ -1402,30 +1401,31 @@ var ( func init() { proto.RegisterFile("execution.proto", fileDescriptorExecution) } var fileDescriptorExecution = []byte{ - // 397 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x52, 0xcd, 0xce, 0xd2, 0x40, - 0x14, 0x65, 0x0a, 0x34, 0xe1, 0x12, 0x83, 0x99, 0xd4, 0x52, 0x1b, 0x53, 0x4c, 0x23, 0xc6, 0x8d, - 0x55, 0x31, 0x31, 0xae, 0xf9, 0x59, 0x98, 0xb8, 0xd0, 0xb2, 0x70, 0x69, 0x0a, 0xbd, 0x81, 0x26, - 0xd8, 0xa9, 0x33, 0x53, 0xd4, 0x9d, 0x3b, 0x1f, 0xc1, 0x57, 0x62, 0xe9, 0xd2, 0x95, 0x91, 0x3e, - 0x81, 0x8f, 0x60, 0xda, 0x29, 0xe5, 0xfb, 0x0a, 0xf9, 0xf8, 0x76, 0x73, 0xcf, 0x3d, 0xf7, 0xe6, - 0x9c, 0x33, 0x17, 0x7a, 0xf8, 0x15, 0x97, 0xa9, 0x8c, 0x58, 0xec, 0x25, 0x9c, 0x49, 0x46, 0xef, - 0x2c, 0x59, 0x2c, 0x83, 0x28, 0x46, 0x1e, 0x7a, 0xdb, 0x17, 0x76, 0xaf, 0x2a, 0x55, 0xdf, 0xee, - 0xe2, 0xa7, 0x44, 0x7e, 0x2b, 0x0b, 0x63, 0xc5, 0x56, 0xac, 0x78, 0x3e, 0xcb, 0x5f, 0x0a, 0x75, - 0x7f, 0x12, 0x30, 0x27, 0x1c, 0x03, 0x89, 0x93, 0xc3, 0xb0, 0x8f, 0x9f, 0x53, 0x14, 0x92, 0x9a, - 0xa0, 0x45, 0xa1, 0x45, 0x1e, 0x92, 0x27, 0x9d, 0xb1, 0x9e, 0xfd, 0x19, 0x68, 0x6f, 0xa6, 0xbe, - 0x16, 0x85, 0x74, 0x00, 0xdd, 0x45, 0x1a, 0x87, 0x1b, 0xfc, 0x98, 0x04, 0x72, 0x6d, 0x69, 0x39, - 0xc1, 0x07, 0x05, 0xbd, 0x0b, 0xe4, 0x9a, 0x1a, 0xd0, 0x16, 0x32, 0x8c, 0x62, 0xab, 0x59, 0xb4, - 0x54, 0x41, 0x4d, 0xd0, 0x85, 0x0c, 0x59, 0x2a, 0xad, 0x56, 0x01, 0x97, 0x55, 0x89, 0x23, 0xe7, - 0x56, 0xbb, 0xc2, 0x91, 0x73, 0xf7, 0x3d, 0xf4, 0x4f, 0x84, 0x89, 0x84, 0xc5, 0x02, 0xe9, 0x2b, - 0xe8, 0x54, 0x56, 0x0b, 0x81, 0xdd, 0x91, 0xe5, 0x5d, 0xcb, 0xc2, 0x3b, 0x0e, 0x1d, 0xa9, 0xee, - 0x73, 0x30, 0xa7, 0xb8, 0xc1, 0xdb, 0x7b, 0x75, 0xef, 0x43, 0xff, 0x64, 0x42, 0x89, 0x70, 0x9f, - 0xc2, 0xbd, 0xb7, 0x91, 0x90, 0x55, 0x43, 0x1c, 0x76, 0x19, 0xd0, 0x66, 0x5f, 0x94, 0xb2, 0x66, - 0x6e, 0xbf, 0x28, 0x5c, 0x1f, 0xcc, 0x3a, 0xbd, 0x74, 0xf3, 0x1a, 0xa0, 0x92, 0x28, 0x8a, 0xa1, - 0x9b, 0xec, 0x5c, 0xe1, 0x8e, 0x7e, 0x68, 0x70, 0x77, 0x76, 0xb8, 0x89, 0x39, 0xf2, 0x6d, 0xb4, - 0x44, 0xfa, 0x01, 0x74, 0x95, 0x1b, 0x1d, 0xd6, 0x97, 0x9c, 0xfd, 0x67, 0xfb, 0xf1, 0x25, 0x5a, - 0xa9, 0x73, 0x06, 0xba, 0xca, 0xe2, 0x64, 0xf1, 0xf9, 0x50, 0x6d, 0xa3, 0x46, 0x9b, 0xe5, 0xd7, - 0x48, 0xe7, 0xd0, 0xca, 0x83, 0xa0, 0x8f, 0x6a, 0xdd, 0xb3, 0x61, 0xda, 0xc3, 0x0b, 0x2c, 0xa5, - 0x6d, 0xfc, 0x60, 0xb7, 0x77, 0x1a, 0xbf, 0xf7, 0x4e, 0xe3, 0xdf, 0xde, 0x21, 0xdf, 0x33, 0x87, - 0xec, 0x32, 0x87, 0xfc, 0xca, 0x1c, 0xf2, 0x37, 0x73, 0xc8, 0x42, 0x2f, 0x6e, 0xfd, 0xe5, 0xff, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xc6, 0x6c, 0x5b, 0x5b, 0x41, 0x03, 0x00, 0x00, + // 413 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x52, 0x4d, 0xab, 0xd3, 0x40, + 0x14, 0x7d, 0x93, 0xf7, 0x1a, 0x78, 0xf7, 0x21, 0x95, 0xa1, 0xa6, 0x31, 0x4a, 0x2a, 0xc1, 0x8a, + 0x1b, 0x53, 0xad, 0x20, 0xae, 0xfb, 0x81, 0x08, 0x2e, 0x34, 0x5d, 0xb8, 0x94, 0xb4, 0xb9, 0xa6, + 0x81, 0x9a, 0x89, 0x33, 0x93, 0xaa, 0x3b, 0xb7, 0xfe, 0x02, 0xff, 0x52, 0x97, 0x2e, 0x5d, 0x89, + 0xcd, 0x2f, 0xf0, 0x27, 0x48, 0x66, 0x92, 0x54, 0xdb, 0x62, 0xdd, 0xcd, 0xbd, 0xf7, 0xdc, 0xc3, + 0x39, 0x67, 0x2e, 0xb4, 0xf1, 0x23, 0x2e, 0x72, 0x99, 0xb0, 0xd4, 0xcf, 0x38, 0x93, 0x8c, 0x5e, + 0x5b, 0xb0, 0x54, 0x86, 0x49, 0x8a, 0x3c, 0xf2, 0xd7, 0x8f, 0x9c, 0x76, 0x53, 0xea, 0xb9, 0x73, + 0x2b, 0x66, 0x2c, 0x5e, 0xe1, 0x40, 0x55, 0xf3, 0xfc, 0xed, 0x00, 0xdf, 0x65, 0xf2, 0x53, 0x35, + 0xec, 0xc4, 0x2c, 0x66, 0xea, 0x39, 0x28, 0x5f, 0xba, 0xeb, 0x7d, 0x25, 0x60, 0x8d, 0x39, 0x86, + 0x12, 0xc7, 0x35, 0x59, 0x80, 0xef, 0x73, 0x14, 0x92, 0x5a, 0x60, 0x24, 0x91, 0x4d, 0xee, 0x90, + 0xfb, 0x97, 0x23, 0xb3, 0xf8, 0xd1, 0x33, 0x9e, 0x4f, 0x02, 0x23, 0x89, 0x68, 0x0f, 0xae, 0xe6, + 0x79, 0x1a, 0xad, 0xf0, 0x4d, 0x16, 0xca, 0xa5, 0x6d, 0x94, 0x80, 0x00, 0x74, 0xeb, 0x65, 0x28, + 0x97, 0xb4, 0x03, 0x2d, 0x21, 0xa3, 0x24, 0xb5, 0xcf, 0xd5, 0x48, 0x17, 0xd4, 0x02, 0x53, 0xc8, + 0x88, 0xe5, 0xd2, 0xbe, 0x50, 0xed, 0xaa, 0xaa, 0xfa, 0xc8, 0xb9, 0xdd, 0x6a, 0xfa, 0xc8, 0xb9, + 0xf7, 0x0a, 0xba, 0x07, 0xc2, 0x44, 0xc6, 0x52, 0x81, 0xf4, 0x09, 0x5c, 0x36, 0xd6, 0x95, 0xc0, + 0xab, 0xa1, 0xed, 0xff, 0x95, 0x8d, 0xbf, 0x5b, 0xda, 0x41, 0xbd, 0x87, 0x60, 0x4d, 0x70, 0x85, + 0xff, 0xef, 0xd5, 0xbb, 0x09, 0xdd, 0x83, 0x0d, 0x2d, 0xc2, 0x7b, 0x00, 0x37, 0x5e, 0x24, 0x42, + 0x36, 0x03, 0x51, 0x73, 0x75, 0xa0, 0xc5, 0x3e, 0x68, 0x65, 0xe7, 0xa5, 0x7d, 0x55, 0x78, 0x01, + 0x58, 0xfb, 0xf0, 0xca, 0xcd, 0x53, 0x80, 0x46, 0xa2, 0x50, 0x4b, 0xff, 0xb2, 0xf3, 0x07, 0x76, + 0xf8, 0xc5, 0x80, 0xeb, 0xd3, 0xfa, 0x46, 0x66, 0xc8, 0xd7, 0xc9, 0x02, 0xe9, 0x6b, 0x30, 0x75, + 0x6e, 0xb4, 0xbf, 0x4f, 0x72, 0xf4, 0x9f, 0x9d, 0x7b, 0xa7, 0x60, 0x95, 0xce, 0x67, 0x60, 0xea, + 0x2c, 0x0e, 0x88, 0x8f, 0x87, 0xea, 0x58, 0xbe, 0xbe, 0x47, 0xbf, 0xbe, 0x47, 0x7f, 0x5a, 0xde, + 0x23, 0x9d, 0xc1, 0x45, 0x19, 0x05, 0xbd, 0xbb, 0x47, 0x73, 0x34, 0x4e, 0xa7, 0x7f, 0x02, 0xa5, + 0xd5, 0x8d, 0x6e, 0x6f, 0xb6, 0xee, 0xd9, 0xf7, 0xad, 0x7b, 0xf6, 0x6b, 0xeb, 0x92, 0xcf, 0x85, + 0x4b, 0x36, 0x85, 0x4b, 0xbe, 0x15, 0x2e, 0xf9, 0x59, 0xb8, 0x64, 0x6e, 0x2a, 0x09, 0x8f, 0x7f, + 0x07, 0x00, 0x00, 0xff, 0xff, 0xaf, 0x29, 0x12, 0x21, 0x53, 0x03, 0x00, 0x00, } diff --git a/api/execution/execution.proto b/api/execution/execution.proto index 45e8396..d67e09e 100644 --- a/api/execution/execution.proto +++ b/api/execution/execution.proto @@ -3,12 +3,12 @@ syntax = "proto3"; package containerd.v1; import "container.proto"; -import "empty.proto"; +import "google/protobuf/empty.proto"; import "gogoproto/gogo.proto"; service ExecutionService{ rpc Create(CreateContainerRequest) returns (CreateContainerResponse); - rpc Delete(DeleteContainerRequest) returns (Empty); + rpc Delete(DeleteContainerRequest) returns (google.protobuf.Empty); rpc List(ListContainersRequest) returns (ListContainersResponse); } diff --git a/api/execution/gen.go b/api/execution/gen.go index c94046a..523d777 100644 --- a/api/execution/gen.go +++ b/api/execution/gen.go @@ -1,3 +1,3 @@ package execution -//go:generate protoc -I.:../..:../../../../../github.com/gogo/protobuf:/usr/local/include --gogoctrd_out=plugins=grpc,import_path=github.com/docker/containerd/api/execution,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:. execution.proto empty.proto container.proto +//go:generate protoc -I.:../..:../../../../../github.com/gogo/protobuf:/usr/local/include --gogoctrd_out=plugins=grpc,import_path=github.com/docker/containerd/api/execution,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:. execution.proto container.proto