diff --git a/api/execution/execution.pb.go b/api/execution/execution.pb.go index 8419535..8632ec7 100644 --- a/api/execution/execution.pb.go +++ b/api/execution/execution.pb.go @@ -12,25 +12,24 @@ Container Process ProcessSpec - Mount User - CreateRequest - CreateResponse - StartRequest + CreateContainerRequest + CreateContainerResponse + StartContainerRequest State - StartResponse - DeleteRequest - DeleteResponse + StartContainerResponse + DeleteContainerRequest + DeleteContainerResponse ContainerListRequest ContainerListResponse - StateRequest - StateResponse - UpdateRequest - UpdateResponse - PauseRequest - PauseResponse - ResumeRequest - ResumeResponse + StateContainerRequest + StateContainerResponse + UpdateContainerRequest + UpdateContainerResponse + PauseContainerRequest + PauseContainerResponse + ResumeContainerRequest + ResumeContainerResponse CreateProcessRequest CreateProcessResponse StartProcessRequest @@ -51,6 +50,7 @@ package execution import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" +import containerd_v1 "github.com/docker/containerd/api/mount" import _ "github.com/gogo/protobuf/gogoproto" import strings "strings" @@ -78,10 +78,10 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package type Container struct { - ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Mounts []*Mount `protobuf:"bytes,2,rep,name=mounts" json:"mounts,omitempty"` - Owner string `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"` - Process *Process `protobuf:"bytes,4,opt,name=process" json:"process,omitempty"` + ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Mounts []*containerd_v1.Mount `protobuf:"bytes,2,rep,name=mounts" json:"mounts,omitempty"` + Owner string `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"` + Process *Process `protobuf:"bytes,4,opt,name=process" json:"process,omitempty"` } func (m *Container) Reset() { *m = Container{} } @@ -116,17 +116,6 @@ func (m *ProcessSpec) Reset() { *m = ProcessSpec{} } func (*ProcessSpec) ProtoMessage() {} func (*ProcessSpec) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{2} } -type Mount struct { - Source string `protobuf:"bytes,1,opt,name=source,proto3" json:"source,omitempty"` - Target string `protobuf:"bytes,2,opt,name=target,proto3" json:"target,omitempty"` - Type string `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"` - Options []string `protobuf:"bytes,4,rep,name=options" json:"options,omitempty"` -} - -func (m *Mount) Reset() { *m = Mount{} } -func (*Mount) ProtoMessage() {} -func (*Mount) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{3} } - type User struct { Uid uint32 `protobuf:"varint,1,opt,name=uid,proto3" json:"uid,omitempty"` Gid uint32 `protobuf:"varint,2,opt,name=gid,proto3" json:"gid,omitempty"` @@ -135,65 +124,67 @@ type User struct { func (m *User) Reset() { *m = User{} } func (*User) ProtoMessage() {} -func (*User) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{4} } +func (*User) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{3} } -type CreateRequest struct { - ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Process *ProcessSpec `protobuf:"bytes,2,opt,name=process" json:"process,omitempty"` - Mounts []*Mount `protobuf:"bytes,3,rep,name=mounts" json:"mounts,omitempty"` - Owner string `protobuf:"bytes,4,opt,name=owner,proto3" json:"owner,omitempty"` - ConfigPath string `protobuf:"bytes,5,opt,name=config_path,json=configPath,proto3" json:"config_path,omitempty"` +type CreateContainerRequest struct { + ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Process *ProcessSpec `protobuf:"bytes,2,opt,name=process" json:"process,omitempty"` + Mounts []*containerd_v1.Mount `protobuf:"bytes,3,rep,name=mounts" json:"mounts,omitempty"` + Owner string `protobuf:"bytes,4,opt,name=owner,proto3" json:"owner,omitempty"` + ConfigPath string `protobuf:"bytes,5,opt,name=config_path,json=configPath,proto3" json:"config_path,omitempty"` } -func (m *CreateRequest) Reset() { *m = CreateRequest{} } -func (*CreateRequest) ProtoMessage() {} -func (*CreateRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{5} } +func (m *CreateContainerRequest) Reset() { *m = CreateContainerRequest{} } +func (*CreateContainerRequest) ProtoMessage() {} +func (*CreateContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{4} } -type CreateResponse struct { +type CreateContainerResponse struct { Container *Container `protobuf:"bytes,1,opt,name=container" json:"container,omitempty"` } -func (m *CreateResponse) Reset() { *m = CreateResponse{} } -func (*CreateResponse) ProtoMessage() {} -func (*CreateResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{6} } +func (m *CreateContainerResponse) Reset() { *m = CreateContainerResponse{} } +func (*CreateContainerResponse) ProtoMessage() {} +func (*CreateContainerResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{5} } -type StartRequest struct { +type StartContainerRequest struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } -func (m *StartRequest) Reset() { *m = StartRequest{} } -func (*StartRequest) ProtoMessage() {} -func (*StartRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{7} } +func (m *StartContainerRequest) Reset() { *m = StartContainerRequest{} } +func (*StartContainerRequest) ProtoMessage() {} +func (*StartContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{6} } type State struct { } func (m *State) Reset() { *m = State{} } func (*State) ProtoMessage() {} -func (*State) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{8} } +func (*State) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{7} } -type StartResponse struct { +type StartContainerResponse struct { State *State `protobuf:"bytes,1,opt,name=state" json:"state,omitempty"` } -func (m *StartResponse) Reset() { *m = StartResponse{} } -func (*StartResponse) ProtoMessage() {} -func (*StartResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{9} } +func (m *StartContainerResponse) Reset() { *m = StartContainerResponse{} } +func (*StartContainerResponse) ProtoMessage() {} +func (*StartContainerResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{8} } -type DeleteRequest struct { +type DeleteContainerRequest struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } -func (m *DeleteRequest) Reset() { *m = DeleteRequest{} } -func (*DeleteRequest) ProtoMessage() {} -func (*DeleteRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{10} } +func (m *DeleteContainerRequest) Reset() { *m = DeleteContainerRequest{} } +func (*DeleteContainerRequest) ProtoMessage() {} +func (*DeleteContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{9} } -type DeleteResponse struct { +type DeleteContainerResponse struct { } -func (m *DeleteResponse) Reset() { *m = DeleteResponse{} } -func (*DeleteResponse) ProtoMessage() {} -func (*DeleteResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{11} } +func (m *DeleteContainerResponse) Reset() { *m = DeleteContainerResponse{} } +func (*DeleteContainerResponse) ProtoMessage() {} +func (*DeleteContainerResponse) Descriptor() ([]byte, []int) { + return fileDescriptorExecution, []int{10} +} type ContainerListRequest struct { Owner []string `protobuf:"bytes,1,rep,name=owner" json:"owner,omitempty"` @@ -201,7 +192,7 @@ type ContainerListRequest struct { func (m *ContainerListRequest) Reset() { *m = ContainerListRequest{} } func (*ContainerListRequest) ProtoMessage() {} -func (*ContainerListRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{12} } +func (*ContainerListRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{11} } type ContainerListResponse struct { Containers []*Container `protobuf:"bytes,1,rep,name=containers" json:"containers,omitempty"` @@ -209,68 +200,72 @@ type ContainerListResponse struct { func (m *ContainerListResponse) Reset() { *m = ContainerListResponse{} } func (*ContainerListResponse) ProtoMessage() {} -func (*ContainerListResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{13} } +func (*ContainerListResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{12} } -type StateRequest struct { +type StateContainerRequest struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } -func (m *StateRequest) Reset() { *m = StateRequest{} } -func (*StateRequest) ProtoMessage() {} -func (*StateRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{14} } +func (m *StateContainerRequest) Reset() { *m = StateContainerRequest{} } +func (*StateContainerRequest) ProtoMessage() {} +func (*StateContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{13} } -type StateResponse struct { +type StateContainerResponse struct { Container *Container `protobuf:"bytes,1,opt,name=container" json:"container,omitempty"` } -func (m *StateResponse) Reset() { *m = StateResponse{} } -func (*StateResponse) ProtoMessage() {} -func (*StateResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{15} } +func (m *StateContainerResponse) Reset() { *m = StateContainerResponse{} } +func (*StateContainerResponse) ProtoMessage() {} +func (*StateContainerResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{14} } -type UpdateRequest struct { +type UpdateContainerRequest struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } -func (m *UpdateRequest) Reset() { *m = UpdateRequest{} } -func (*UpdateRequest) ProtoMessage() {} -func (*UpdateRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{16} } +func (m *UpdateContainerRequest) Reset() { *m = UpdateContainerRequest{} } +func (*UpdateContainerRequest) ProtoMessage() {} +func (*UpdateContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{15} } -type UpdateResponse struct { +type UpdateContainerResponse struct { } -func (m *UpdateResponse) Reset() { *m = UpdateResponse{} } -func (*UpdateResponse) ProtoMessage() {} -func (*UpdateResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{17} } +func (m *UpdateContainerResponse) Reset() { *m = UpdateContainerResponse{} } +func (*UpdateContainerResponse) ProtoMessage() {} +func (*UpdateContainerResponse) Descriptor() ([]byte, []int) { + return fileDescriptorExecution, []int{16} +} -type PauseRequest struct { +type PauseContainerRequest struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } -func (m *PauseRequest) Reset() { *m = PauseRequest{} } -func (*PauseRequest) ProtoMessage() {} -func (*PauseRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{18} } +func (m *PauseContainerRequest) Reset() { *m = PauseContainerRequest{} } +func (*PauseContainerRequest) ProtoMessage() {} +func (*PauseContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{17} } -type PauseResponse struct { +type PauseContainerResponse struct { } -func (m *PauseResponse) Reset() { *m = PauseResponse{} } -func (*PauseResponse) ProtoMessage() {} -func (*PauseResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{19} } +func (m *PauseContainerResponse) Reset() { *m = PauseContainerResponse{} } +func (*PauseContainerResponse) ProtoMessage() {} +func (*PauseContainerResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{18} } -type ResumeRequest struct { +type ResumeContainerRequest struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } -func (m *ResumeRequest) Reset() { *m = ResumeRequest{} } -func (*ResumeRequest) ProtoMessage() {} -func (*ResumeRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{20} } +func (m *ResumeContainerRequest) Reset() { *m = ResumeContainerRequest{} } +func (*ResumeContainerRequest) ProtoMessage() {} +func (*ResumeContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{19} } -type ResumeResponse struct { +type ResumeContainerResponse struct { } -func (m *ResumeResponse) Reset() { *m = ResumeResponse{} } -func (*ResumeResponse) ProtoMessage() {} -func (*ResumeResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{21} } +func (m *ResumeContainerResponse) Reset() { *m = ResumeContainerResponse{} } +func (*ResumeContainerResponse) ProtoMessage() {} +func (*ResumeContainerResponse) Descriptor() ([]byte, []int) { + return fileDescriptorExecution, []int{20} +} type CreateProcessRequest struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` @@ -279,14 +274,14 @@ type CreateProcessRequest struct { func (m *CreateProcessRequest) Reset() { *m = CreateProcessRequest{} } func (*CreateProcessRequest) ProtoMessage() {} -func (*CreateProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{22} } +func (*CreateProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{21} } type CreateProcessResponse struct { } func (m *CreateProcessResponse) Reset() { *m = CreateProcessResponse{} } func (*CreateProcessResponse) ProtoMessage() {} -func (*CreateProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{23} } +func (*CreateProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{22} } type StartProcessRequest struct { Cid string `protobuf:"bytes,1,opt,name=cid,proto3" json:"cid,omitempty"` @@ -295,7 +290,7 @@ type StartProcessRequest struct { func (m *StartProcessRequest) Reset() { *m = StartProcessRequest{} } func (*StartProcessRequest) ProtoMessage() {} -func (*StartProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{24} } +func (*StartProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{23} } type StartProcessResponse struct { Pid uint32 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid,omitempty"` @@ -303,7 +298,7 @@ type StartProcessResponse struct { func (m *StartProcessResponse) Reset() { *m = StartProcessResponse{} } func (*StartProcessResponse) ProtoMessage() {} -func (*StartProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{25} } +func (*StartProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{24} } type ProcessStateRequest struct { Cid string `protobuf:"bytes,1,opt,name=cid,proto3" json:"cid,omitempty"` @@ -312,7 +307,7 @@ type ProcessStateRequest struct { func (m *ProcessStateRequest) Reset() { *m = ProcessStateRequest{} } func (*ProcessStateRequest) ProtoMessage() {} -func (*ProcessStateRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{26} } +func (*ProcessStateRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{25} } type ProcessStateResponse struct { State *State `protobuf:"bytes,1,opt,name=state" json:"state,omitempty"` @@ -320,7 +315,7 @@ type ProcessStateResponse struct { func (m *ProcessStateResponse) Reset() { *m = ProcessStateResponse{} } func (*ProcessStateResponse) ProtoMessage() {} -func (*ProcessStateResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{27} } +func (*ProcessStateResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{26} } type SignalProcessRequest struct { Cid string `protobuf:"bytes,1,opt,name=cid,proto3" json:"cid,omitempty"` @@ -330,14 +325,14 @@ type SignalProcessRequest struct { func (m *SignalProcessRequest) Reset() { *m = SignalProcessRequest{} } func (*SignalProcessRequest) ProtoMessage() {} -func (*SignalProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{28} } +func (*SignalProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{27} } type SignalProcessResponse struct { } func (m *SignalProcessResponse) Reset() { *m = SignalProcessResponse{} } func (*SignalProcessResponse) ProtoMessage() {} -func (*SignalProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{29} } +func (*SignalProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{28} } type DeleteProcessRequest struct { Cid string `protobuf:"bytes,1,opt,name=cid,proto3" json:"cid,omitempty"` @@ -346,14 +341,14 @@ type DeleteProcessRequest struct { func (m *DeleteProcessRequest) Reset() { *m = DeleteProcessRequest{} } func (*DeleteProcessRequest) ProtoMessage() {} -func (*DeleteProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{30} } +func (*DeleteProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{29} } type DeleteProcessResponse struct { } func (m *DeleteProcessResponse) Reset() { *m = DeleteProcessResponse{} } func (*DeleteProcessResponse) ProtoMessage() {} -func (*DeleteProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{31} } +func (*DeleteProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{30} } type ProcessListRequest struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` @@ -361,52 +356,51 @@ type ProcessListRequest struct { func (m *ProcessListRequest) Reset() { *m = ProcessListRequest{} } func (*ProcessListRequest) ProtoMessage() {} -func (*ProcessListRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{32} } +func (*ProcessListRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{31} } type ProcessListResponse struct { } func (m *ProcessListResponse) Reset() { *m = ProcessListResponse{} } func (*ProcessListResponse) ProtoMessage() {} -func (*ProcessListResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{33} } +func (*ProcessListResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{32} } type EventsRequest struct { } func (m *EventsRequest) Reset() { *m = EventsRequest{} } func (*EventsRequest) ProtoMessage() {} -func (*EventsRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{34} } +func (*EventsRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{33} } type EventsResponse struct { } func (m *EventsResponse) Reset() { *m = EventsResponse{} } func (*EventsResponse) ProtoMessage() {} -func (*EventsResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{35} } +func (*EventsResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{34} } func init() { proto.RegisterType((*Container)(nil), "containerd.v1.Container") proto.RegisterType((*Process)(nil), "containerd.v1.Process") proto.RegisterType((*ProcessSpec)(nil), "containerd.v1.ProcessSpec") - proto.RegisterType((*Mount)(nil), "containerd.v1.Mount") proto.RegisterType((*User)(nil), "containerd.v1.User") - proto.RegisterType((*CreateRequest)(nil), "containerd.v1.CreateRequest") - proto.RegisterType((*CreateResponse)(nil), "containerd.v1.CreateResponse") - proto.RegisterType((*StartRequest)(nil), "containerd.v1.StartRequest") + proto.RegisterType((*CreateContainerRequest)(nil), "containerd.v1.CreateContainerRequest") + proto.RegisterType((*CreateContainerResponse)(nil), "containerd.v1.CreateContainerResponse") + proto.RegisterType((*StartContainerRequest)(nil), "containerd.v1.StartContainerRequest") proto.RegisterType((*State)(nil), "containerd.v1.State") - proto.RegisterType((*StartResponse)(nil), "containerd.v1.StartResponse") - proto.RegisterType((*DeleteRequest)(nil), "containerd.v1.DeleteRequest") - proto.RegisterType((*DeleteResponse)(nil), "containerd.v1.DeleteResponse") + proto.RegisterType((*StartContainerResponse)(nil), "containerd.v1.StartContainerResponse") + proto.RegisterType((*DeleteContainerRequest)(nil), "containerd.v1.DeleteContainerRequest") + proto.RegisterType((*DeleteContainerResponse)(nil), "containerd.v1.DeleteContainerResponse") proto.RegisterType((*ContainerListRequest)(nil), "containerd.v1.ContainerListRequest") proto.RegisterType((*ContainerListResponse)(nil), "containerd.v1.ContainerListResponse") - proto.RegisterType((*StateRequest)(nil), "containerd.v1.StateRequest") - proto.RegisterType((*StateResponse)(nil), "containerd.v1.StateResponse") - proto.RegisterType((*UpdateRequest)(nil), "containerd.v1.UpdateRequest") - proto.RegisterType((*UpdateResponse)(nil), "containerd.v1.UpdateResponse") - proto.RegisterType((*PauseRequest)(nil), "containerd.v1.PauseRequest") - proto.RegisterType((*PauseResponse)(nil), "containerd.v1.PauseResponse") - proto.RegisterType((*ResumeRequest)(nil), "containerd.v1.ResumeRequest") - proto.RegisterType((*ResumeResponse)(nil), "containerd.v1.ResumeResponse") + proto.RegisterType((*StateContainerRequest)(nil), "containerd.v1.StateContainerRequest") + proto.RegisterType((*StateContainerResponse)(nil), "containerd.v1.StateContainerResponse") + proto.RegisterType((*UpdateContainerRequest)(nil), "containerd.v1.UpdateContainerRequest") + proto.RegisterType((*UpdateContainerResponse)(nil), "containerd.v1.UpdateContainerResponse") + proto.RegisterType((*PauseContainerRequest)(nil), "containerd.v1.PauseContainerRequest") + proto.RegisterType((*PauseContainerResponse)(nil), "containerd.v1.PauseContainerResponse") + proto.RegisterType((*ResumeContainerRequest)(nil), "containerd.v1.ResumeContainerRequest") + proto.RegisterType((*ResumeContainerResponse)(nil), "containerd.v1.ResumeContainerResponse") proto.RegisterType((*CreateProcessRequest)(nil), "containerd.v1.CreateProcessRequest") proto.RegisterType((*CreateProcessResponse)(nil), "containerd.v1.CreateProcessResponse") proto.RegisterType((*StartProcessRequest)(nil), "containerd.v1.StartProcessRequest") @@ -475,19 +469,6 @@ func (this *ProcessSpec) GoString() string { s = append(s, "}") return strings.Join(s, "") } -func (this *Mount) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 8) - s = append(s, "&execution.Mount{") - s = append(s, "Source: "+fmt.Sprintf("%#v", this.Source)+",\n") - s = append(s, "Target: "+fmt.Sprintf("%#v", this.Target)+",\n") - s = append(s, "Type: "+fmt.Sprintf("%#v", this.Type)+",\n") - s = append(s, "Options: "+fmt.Sprintf("%#v", this.Options)+",\n") - s = append(s, "}") - return strings.Join(s, "") -} func (this *User) GoString() string { if this == nil { return "nil" @@ -500,12 +481,12 @@ func (this *User) GoString() string { s = append(s, "}") return strings.Join(s, "") } -func (this *CreateRequest) GoString() string { +func (this *CreateContainerRequest) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 9) - s = append(s, "&execution.CreateRequest{") + s = append(s, "&execution.CreateContainerRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") if this.Process != nil { s = append(s, "Process: "+fmt.Sprintf("%#v", this.Process)+",\n") @@ -518,24 +499,24 @@ func (this *CreateRequest) GoString() string { s = append(s, "}") return strings.Join(s, "") } -func (this *CreateResponse) GoString() string { +func (this *CreateContainerResponse) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&execution.CreateResponse{") + s = append(s, "&execution.CreateContainerResponse{") if this.Container != nil { s = append(s, "Container: "+fmt.Sprintf("%#v", this.Container)+",\n") } s = append(s, "}") return strings.Join(s, "") } -func (this *StartRequest) GoString() string { +func (this *StartContainerRequest) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&execution.StartRequest{") + s = append(s, "&execution.StartContainerRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "}") return strings.Join(s, "") @@ -549,34 +530,34 @@ func (this *State) GoString() string { s = append(s, "}") return strings.Join(s, "") } -func (this *StartResponse) GoString() string { +func (this *StartContainerResponse) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&execution.StartResponse{") + s = append(s, "&execution.StartContainerResponse{") if this.State != nil { s = append(s, "State: "+fmt.Sprintf("%#v", this.State)+",\n") } s = append(s, "}") return strings.Join(s, "") } -func (this *DeleteRequest) GoString() string { +func (this *DeleteContainerRequest) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&execution.DeleteRequest{") + s = append(s, "&execution.DeleteContainerRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "}") return strings.Join(s, "") } -func (this *DeleteResponse) GoString() string { +func (this *DeleteContainerResponse) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 4) - s = append(s, "&execution.DeleteResponse{") + s = append(s, "&execution.DeleteContainerResponse{") s = append(s, "}") return strings.Join(s, "") } @@ -602,82 +583,82 @@ func (this *ContainerListResponse) GoString() string { s = append(s, "}") return strings.Join(s, "") } -func (this *StateRequest) GoString() string { +func (this *StateContainerRequest) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&execution.StateRequest{") + s = append(s, "&execution.StateContainerRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "}") return strings.Join(s, "") } -func (this *StateResponse) GoString() string { +func (this *StateContainerResponse) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&execution.StateResponse{") + s = append(s, "&execution.StateContainerResponse{") if this.Container != nil { s = append(s, "Container: "+fmt.Sprintf("%#v", this.Container)+",\n") } s = append(s, "}") return strings.Join(s, "") } -func (this *UpdateRequest) GoString() string { +func (this *UpdateContainerRequest) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&execution.UpdateRequest{") + s = append(s, "&execution.UpdateContainerRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "}") return strings.Join(s, "") } -func (this *UpdateResponse) GoString() string { +func (this *UpdateContainerResponse) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 4) - s = append(s, "&execution.UpdateResponse{") + s = append(s, "&execution.UpdateContainerResponse{") s = append(s, "}") return strings.Join(s, "") } -func (this *PauseRequest) GoString() string { +func (this *PauseContainerRequest) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&execution.PauseRequest{") + s = append(s, "&execution.PauseContainerRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "}") return strings.Join(s, "") } -func (this *PauseResponse) GoString() string { +func (this *PauseContainerResponse) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 4) - s = append(s, "&execution.PauseResponse{") + s = append(s, "&execution.PauseContainerResponse{") s = append(s, "}") return strings.Join(s, "") } -func (this *ResumeRequest) GoString() string { +func (this *ResumeContainerRequest) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&execution.ResumeRequest{") + s = append(s, "&execution.ResumeContainerRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "}") return strings.Join(s, "") } -func (this *ResumeResponse) GoString() string { +func (this *ResumeContainerResponse) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 4) - s = append(s, "&execution.ResumeResponse{") + s = append(s, "&execution.ResumeContainerResponse{") s = append(s, "}") return strings.Join(s, "") } @@ -860,16 +841,16 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// Client API for Containers service +// Client API for Execution service -type ContainersClient interface { - Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) - Start(ctx context.Context, in *StartRequest, opts ...grpc.CallOption) (*StartResponse, error) - Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) - State(ctx context.Context, in *StateRequest, opts ...grpc.CallOption) (*StateResponse, error) - Update(ctx context.Context, in *UpdateRequest, opts ...grpc.CallOption) (*UpdateResponse, error) - Pause(ctx context.Context, in *PauseRequest, opts ...grpc.CallOption) (*PauseResponse, error) - Resume(ctx context.Context, in *ResumeRequest, opts ...grpc.CallOption) (*ResumeResponse, error) +type ExecutionClient interface { + CreateContainer(ctx context.Context, in *CreateContainerRequest, opts ...grpc.CallOption) (*CreateContainerResponse, error) + StartContainer(ctx context.Context, in *StartContainerRequest, opts ...grpc.CallOption) (*StartContainerResponse, error) + DeleteContainer(ctx context.Context, in *DeleteContainerRequest, opts ...grpc.CallOption) (*DeleteContainerResponse, error) + StateContainer(ctx context.Context, in *StateContainerRequest, opts ...grpc.CallOption) (*StateContainerResponse, error) + UpdateContainer(ctx context.Context, in *UpdateContainerRequest, opts ...grpc.CallOption) (*UpdateContainerResponse, error) + PauseContainer(ctx context.Context, in *PauseContainerRequest, opts ...grpc.CallOption) (*PauseContainerResponse, error) + ResumeContainer(ctx context.Context, in *ResumeContainerRequest, opts ...grpc.CallOption) (*ResumeContainerResponse, error) ContainerList(ctx context.Context, in *ContainerListRequest, opts ...grpc.CallOption) (*ContainerListResponse, error) CreateProcess(ctx context.Context, in *CreateProcessRequest, opts ...grpc.CallOption) (*CreateProcessResponse, error) StartProcess(ctx context.Context, in *StartProcessRequest, opts ...grpc.CallOption) (*StartProcessResponse, error) @@ -877,149 +858,149 @@ type ContainersClient interface { SignalProcess(ctx context.Context, in *SignalProcessRequest, opts ...grpc.CallOption) (*SignalProcessResponse, error) DeleteProcess(ctx context.Context, in *DeleteProcessRequest, opts ...grpc.CallOption) (*DeleteProcessResponse, error) ProcessList(ctx context.Context, in *ProcessListRequest, opts ...grpc.CallOption) (*ProcessListResponse, error) - Events(ctx context.Context, in *EventsRequest, opts ...grpc.CallOption) (Containers_EventsClient, error) + Events(ctx context.Context, in *EventsRequest, opts ...grpc.CallOption) (Execution_EventsClient, error) } -type containersClient struct { +type executionClient struct { cc *grpc.ClientConn } -func NewContainersClient(cc *grpc.ClientConn) ContainersClient { - return &containersClient{cc} +func NewExecutionClient(cc *grpc.ClientConn) ExecutionClient { + return &executionClient{cc} } -func (c *containersClient) Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) { - out := new(CreateResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Containers/Create", in, out, c.cc, opts...) +func (c *executionClient) CreateContainer(ctx context.Context, in *CreateContainerRequest, opts ...grpc.CallOption) (*CreateContainerResponse, error) { + out := new(CreateContainerResponse) + err := grpc.Invoke(ctx, "/containerd.v1.Execution/CreateContainer", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *containersClient) Start(ctx context.Context, in *StartRequest, opts ...grpc.CallOption) (*StartResponse, error) { - out := new(StartResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Containers/Start", in, out, c.cc, opts...) +func (c *executionClient) StartContainer(ctx context.Context, in *StartContainerRequest, opts ...grpc.CallOption) (*StartContainerResponse, error) { + out := new(StartContainerResponse) + err := grpc.Invoke(ctx, "/containerd.v1.Execution/StartContainer", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *containersClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) { - out := new(DeleteResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Containers/Delete", in, out, c.cc, opts...) +func (c *executionClient) DeleteContainer(ctx context.Context, in *DeleteContainerRequest, opts ...grpc.CallOption) (*DeleteContainerResponse, error) { + out := new(DeleteContainerResponse) + err := grpc.Invoke(ctx, "/containerd.v1.Execution/DeleteContainer", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *containersClient) State(ctx context.Context, in *StateRequest, opts ...grpc.CallOption) (*StateResponse, error) { - out := new(StateResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Containers/State", in, out, c.cc, opts...) +func (c *executionClient) StateContainer(ctx context.Context, in *StateContainerRequest, opts ...grpc.CallOption) (*StateContainerResponse, error) { + out := new(StateContainerResponse) + err := grpc.Invoke(ctx, "/containerd.v1.Execution/StateContainer", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *containersClient) Update(ctx context.Context, in *UpdateRequest, opts ...grpc.CallOption) (*UpdateResponse, error) { - out := new(UpdateResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Containers/Update", in, out, c.cc, opts...) +func (c *executionClient) UpdateContainer(ctx context.Context, in *UpdateContainerRequest, opts ...grpc.CallOption) (*UpdateContainerResponse, error) { + out := new(UpdateContainerResponse) + err := grpc.Invoke(ctx, "/containerd.v1.Execution/UpdateContainer", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *containersClient) Pause(ctx context.Context, in *PauseRequest, opts ...grpc.CallOption) (*PauseResponse, error) { - out := new(PauseResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Containers/Pause", in, out, c.cc, opts...) +func (c *executionClient) PauseContainer(ctx context.Context, in *PauseContainerRequest, opts ...grpc.CallOption) (*PauseContainerResponse, error) { + out := new(PauseContainerResponse) + err := grpc.Invoke(ctx, "/containerd.v1.Execution/PauseContainer", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *containersClient) Resume(ctx context.Context, in *ResumeRequest, opts ...grpc.CallOption) (*ResumeResponse, error) { - out := new(ResumeResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Containers/Resume", in, out, c.cc, opts...) +func (c *executionClient) ResumeContainer(ctx context.Context, in *ResumeContainerRequest, opts ...grpc.CallOption) (*ResumeContainerResponse, error) { + out := new(ResumeContainerResponse) + err := grpc.Invoke(ctx, "/containerd.v1.Execution/ResumeContainer", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *containersClient) ContainerList(ctx context.Context, in *ContainerListRequest, opts ...grpc.CallOption) (*ContainerListResponse, error) { +func (c *executionClient) ContainerList(ctx context.Context, in *ContainerListRequest, opts ...grpc.CallOption) (*ContainerListResponse, error) { out := new(ContainerListResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Containers/ContainerList", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.Execution/ContainerList", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *containersClient) CreateProcess(ctx context.Context, in *CreateProcessRequest, opts ...grpc.CallOption) (*CreateProcessResponse, error) { +func (c *executionClient) CreateProcess(ctx context.Context, in *CreateProcessRequest, opts ...grpc.CallOption) (*CreateProcessResponse, error) { out := new(CreateProcessResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Containers/CreateProcess", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.Execution/CreateProcess", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *containersClient) StartProcess(ctx context.Context, in *StartProcessRequest, opts ...grpc.CallOption) (*StartProcessResponse, error) { +func (c *executionClient) StartProcess(ctx context.Context, in *StartProcessRequest, opts ...grpc.CallOption) (*StartProcessResponse, error) { out := new(StartProcessResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Containers/StartProcess", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.Execution/StartProcess", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *containersClient) ProcessState(ctx context.Context, in *ProcessStateRequest, opts ...grpc.CallOption) (*ProcessStateResponse, error) { +func (c *executionClient) ProcessState(ctx context.Context, in *ProcessStateRequest, opts ...grpc.CallOption) (*ProcessStateResponse, error) { out := new(ProcessStateResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Containers/ProcessState", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.Execution/ProcessState", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *containersClient) SignalProcess(ctx context.Context, in *SignalProcessRequest, opts ...grpc.CallOption) (*SignalProcessResponse, error) { +func (c *executionClient) SignalProcess(ctx context.Context, in *SignalProcessRequest, opts ...grpc.CallOption) (*SignalProcessResponse, error) { out := new(SignalProcessResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Containers/SignalProcess", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.Execution/SignalProcess", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *containersClient) DeleteProcess(ctx context.Context, in *DeleteProcessRequest, opts ...grpc.CallOption) (*DeleteProcessResponse, error) { +func (c *executionClient) DeleteProcess(ctx context.Context, in *DeleteProcessRequest, opts ...grpc.CallOption) (*DeleteProcessResponse, error) { out := new(DeleteProcessResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Containers/DeleteProcess", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.Execution/DeleteProcess", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *containersClient) ProcessList(ctx context.Context, in *ProcessListRequest, opts ...grpc.CallOption) (*ProcessListResponse, error) { +func (c *executionClient) ProcessList(ctx context.Context, in *ProcessListRequest, opts ...grpc.CallOption) (*ProcessListResponse, error) { out := new(ProcessListResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Containers/ProcessList", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.Execution/ProcessList", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *containersClient) Events(ctx context.Context, in *EventsRequest, opts ...grpc.CallOption) (Containers_EventsClient, error) { - stream, err := grpc.NewClientStream(ctx, &_Containers_serviceDesc.Streams[0], c.cc, "/containerd.v1.Containers/Events", opts...) +func (c *executionClient) Events(ctx context.Context, in *EventsRequest, opts ...grpc.CallOption) (Execution_EventsClient, error) { + stream, err := grpc.NewClientStream(ctx, &_Execution_serviceDesc.Streams[0], c.cc, "/containerd.v1.Execution/Events", opts...) if err != nil { return nil, err } - x := &containersEventsClient{stream} + x := &executionEventsClient{stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -1029,16 +1010,16 @@ func (c *containersClient) Events(ctx context.Context, in *EventsRequest, opts . return x, nil } -type Containers_EventsClient interface { +type Execution_EventsClient interface { Recv() (*EventsResponse, error) grpc.ClientStream } -type containersEventsClient struct { +type executionEventsClient struct { grpc.ClientStream } -func (x *containersEventsClient) Recv() (*EventsResponse, error) { +func (x *executionEventsClient) Recv() (*EventsResponse, error) { m := new(EventsResponse) if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err @@ -1046,16 +1027,16 @@ func (x *containersEventsClient) Recv() (*EventsResponse, error) { return m, nil } -// Server API for Containers service +// Server API for Execution service -type ContainersServer interface { - Create(context.Context, *CreateRequest) (*CreateResponse, error) - Start(context.Context, *StartRequest) (*StartResponse, error) - Delete(context.Context, *DeleteRequest) (*DeleteResponse, error) - State(context.Context, *StateRequest) (*StateResponse, error) - Update(context.Context, *UpdateRequest) (*UpdateResponse, error) - Pause(context.Context, *PauseRequest) (*PauseResponse, error) - Resume(context.Context, *ResumeRequest) (*ResumeResponse, error) +type ExecutionServer interface { + CreateContainer(context.Context, *CreateContainerRequest) (*CreateContainerResponse, error) + StartContainer(context.Context, *StartContainerRequest) (*StartContainerResponse, error) + DeleteContainer(context.Context, *DeleteContainerRequest) (*DeleteContainerResponse, error) + StateContainer(context.Context, *StateContainerRequest) (*StateContainerResponse, error) + UpdateContainer(context.Context, *UpdateContainerRequest) (*UpdateContainerResponse, error) + PauseContainer(context.Context, *PauseContainerRequest) (*PauseContainerResponse, error) + ResumeContainer(context.Context, *ResumeContainerRequest) (*ResumeContainerResponse, error) ContainerList(context.Context, *ContainerListRequest) (*ContainerListResponse, error) CreateProcess(context.Context, *CreateProcessRequest) (*CreateProcessResponse, error) StartProcess(context.Context, *StartProcessRequest) (*StartProcessResponse, error) @@ -1063,351 +1044,351 @@ type ContainersServer interface { SignalProcess(context.Context, *SignalProcessRequest) (*SignalProcessResponse, error) DeleteProcess(context.Context, *DeleteProcessRequest) (*DeleteProcessResponse, error) ProcessList(context.Context, *ProcessListRequest) (*ProcessListResponse, error) - Events(*EventsRequest, Containers_EventsServer) error + Events(*EventsRequest, Execution_EventsServer) error } -func RegisterContainersServer(s *grpc.Server, srv ContainersServer) { - s.RegisterService(&_Containers_serviceDesc, srv) +func RegisterExecutionServer(s *grpc.Server, srv ExecutionServer) { + s.RegisterService(&_Execution_serviceDesc, srv) } -func _Containers_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(CreateRequest) +func _Execution_CreateContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateContainerRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ContainersServer).Create(ctx, in) + return srv.(ExecutionServer).CreateContainer(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Containers/Create", + FullMethod: "/containerd.v1.Execution/CreateContainer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ContainersServer).Create(ctx, req.(*CreateRequest)) + return srv.(ExecutionServer).CreateContainer(ctx, req.(*CreateContainerRequest)) } return interceptor(ctx, in, info, handler) } -func _Containers_Start_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(StartRequest) +func _Execution_StartContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(StartContainerRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ContainersServer).Start(ctx, in) + return srv.(ExecutionServer).StartContainer(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Containers/Start", + FullMethod: "/containerd.v1.Execution/StartContainer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ContainersServer).Start(ctx, req.(*StartRequest)) + return srv.(ExecutionServer).StartContainer(ctx, req.(*StartContainerRequest)) } return interceptor(ctx, in, info, handler) } -func _Containers_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(DeleteRequest) +func _Execution_DeleteContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteContainerRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ContainersServer).Delete(ctx, in) + return srv.(ExecutionServer).DeleteContainer(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Containers/Delete", + FullMethod: "/containerd.v1.Execution/DeleteContainer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ContainersServer).Delete(ctx, req.(*DeleteRequest)) + return srv.(ExecutionServer).DeleteContainer(ctx, req.(*DeleteContainerRequest)) } return interceptor(ctx, in, info, handler) } -func _Containers_State_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(StateRequest) +func _Execution_StateContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(StateContainerRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ContainersServer).State(ctx, in) + return srv.(ExecutionServer).StateContainer(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Containers/State", + FullMethod: "/containerd.v1.Execution/StateContainer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ContainersServer).State(ctx, req.(*StateRequest)) + return srv.(ExecutionServer).StateContainer(ctx, req.(*StateContainerRequest)) } return interceptor(ctx, in, info, handler) } -func _Containers_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(UpdateRequest) +func _Execution_UpdateContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateContainerRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ContainersServer).Update(ctx, in) + return srv.(ExecutionServer).UpdateContainer(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Containers/Update", + FullMethod: "/containerd.v1.Execution/UpdateContainer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ContainersServer).Update(ctx, req.(*UpdateRequest)) + return srv.(ExecutionServer).UpdateContainer(ctx, req.(*UpdateContainerRequest)) } return interceptor(ctx, in, info, handler) } -func _Containers_Pause_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(PauseRequest) +func _Execution_PauseContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(PauseContainerRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ContainersServer).Pause(ctx, in) + return srv.(ExecutionServer).PauseContainer(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Containers/Pause", + FullMethod: "/containerd.v1.Execution/PauseContainer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ContainersServer).Pause(ctx, req.(*PauseRequest)) + return srv.(ExecutionServer).PauseContainer(ctx, req.(*PauseContainerRequest)) } return interceptor(ctx, in, info, handler) } -func _Containers_Resume_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ResumeRequest) +func _Execution_ResumeContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ResumeContainerRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ContainersServer).Resume(ctx, in) + return srv.(ExecutionServer).ResumeContainer(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Containers/Resume", + FullMethod: "/containerd.v1.Execution/ResumeContainer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ContainersServer).Resume(ctx, req.(*ResumeRequest)) + return srv.(ExecutionServer).ResumeContainer(ctx, req.(*ResumeContainerRequest)) } return interceptor(ctx, in, info, handler) } -func _Containers_ContainerList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Execution_ContainerList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ContainerListRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ContainersServer).ContainerList(ctx, in) + return srv.(ExecutionServer).ContainerList(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Containers/ContainerList", + FullMethod: "/containerd.v1.Execution/ContainerList", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ContainersServer).ContainerList(ctx, req.(*ContainerListRequest)) + return srv.(ExecutionServer).ContainerList(ctx, req.(*ContainerListRequest)) } return interceptor(ctx, in, info, handler) } -func _Containers_CreateProcess_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Execution_CreateProcess_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(CreateProcessRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ContainersServer).CreateProcess(ctx, in) + return srv.(ExecutionServer).CreateProcess(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Containers/CreateProcess", + FullMethod: "/containerd.v1.Execution/CreateProcess", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ContainersServer).CreateProcess(ctx, req.(*CreateProcessRequest)) + return srv.(ExecutionServer).CreateProcess(ctx, req.(*CreateProcessRequest)) } return interceptor(ctx, in, info, handler) } -func _Containers_StartProcess_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Execution_StartProcess_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(StartProcessRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ContainersServer).StartProcess(ctx, in) + return srv.(ExecutionServer).StartProcess(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Containers/StartProcess", + FullMethod: "/containerd.v1.Execution/StartProcess", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ContainersServer).StartProcess(ctx, req.(*StartProcessRequest)) + return srv.(ExecutionServer).StartProcess(ctx, req.(*StartProcessRequest)) } return interceptor(ctx, in, info, handler) } -func _Containers_ProcessState_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Execution_ProcessState_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ProcessStateRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ContainersServer).ProcessState(ctx, in) + return srv.(ExecutionServer).ProcessState(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Containers/ProcessState", + FullMethod: "/containerd.v1.Execution/ProcessState", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ContainersServer).ProcessState(ctx, req.(*ProcessStateRequest)) + return srv.(ExecutionServer).ProcessState(ctx, req.(*ProcessStateRequest)) } return interceptor(ctx, in, info, handler) } -func _Containers_SignalProcess_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Execution_SignalProcess_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(SignalProcessRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ContainersServer).SignalProcess(ctx, in) + return srv.(ExecutionServer).SignalProcess(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Containers/SignalProcess", + FullMethod: "/containerd.v1.Execution/SignalProcess", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ContainersServer).SignalProcess(ctx, req.(*SignalProcessRequest)) + return srv.(ExecutionServer).SignalProcess(ctx, req.(*SignalProcessRequest)) } return interceptor(ctx, in, info, handler) } -func _Containers_DeleteProcess_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Execution_DeleteProcess_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(DeleteProcessRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ContainersServer).DeleteProcess(ctx, in) + return srv.(ExecutionServer).DeleteProcess(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Containers/DeleteProcess", + FullMethod: "/containerd.v1.Execution/DeleteProcess", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ContainersServer).DeleteProcess(ctx, req.(*DeleteProcessRequest)) + return srv.(ExecutionServer).DeleteProcess(ctx, req.(*DeleteProcessRequest)) } return interceptor(ctx, in, info, handler) } -func _Containers_ProcessList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Execution_ProcessList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ProcessListRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ContainersServer).ProcessList(ctx, in) + return srv.(ExecutionServer).ProcessList(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Containers/ProcessList", + FullMethod: "/containerd.v1.Execution/ProcessList", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ContainersServer).ProcessList(ctx, req.(*ProcessListRequest)) + return srv.(ExecutionServer).ProcessList(ctx, req.(*ProcessListRequest)) } return interceptor(ctx, in, info, handler) } -func _Containers_Events_Handler(srv interface{}, stream grpc.ServerStream) error { +func _Execution_Events_Handler(srv interface{}, stream grpc.ServerStream) error { m := new(EventsRequest) if err := stream.RecvMsg(m); err != nil { return err } - return srv.(ContainersServer).Events(m, &containersEventsServer{stream}) + return srv.(ExecutionServer).Events(m, &executionEventsServer{stream}) } -type Containers_EventsServer interface { +type Execution_EventsServer interface { Send(*EventsResponse) error grpc.ServerStream } -type containersEventsServer struct { +type executionEventsServer struct { grpc.ServerStream } -func (x *containersEventsServer) Send(m *EventsResponse) error { +func (x *executionEventsServer) Send(m *EventsResponse) error { return x.ServerStream.SendMsg(m) } -var _Containers_serviceDesc = grpc.ServiceDesc{ - ServiceName: "containerd.v1.Containers", - HandlerType: (*ContainersServer)(nil), +var _Execution_serviceDesc = grpc.ServiceDesc{ + ServiceName: "containerd.v1.Execution", + HandlerType: (*ExecutionServer)(nil), Methods: []grpc.MethodDesc{ { - MethodName: "Create", - Handler: _Containers_Create_Handler, + MethodName: "CreateContainer", + Handler: _Execution_CreateContainer_Handler, }, { - MethodName: "Start", - Handler: _Containers_Start_Handler, + MethodName: "StartContainer", + Handler: _Execution_StartContainer_Handler, }, { - MethodName: "Delete", - Handler: _Containers_Delete_Handler, + MethodName: "DeleteContainer", + Handler: _Execution_DeleteContainer_Handler, }, { - MethodName: "State", - Handler: _Containers_State_Handler, + MethodName: "StateContainer", + Handler: _Execution_StateContainer_Handler, }, { - MethodName: "Update", - Handler: _Containers_Update_Handler, + MethodName: "UpdateContainer", + Handler: _Execution_UpdateContainer_Handler, }, { - MethodName: "Pause", - Handler: _Containers_Pause_Handler, + MethodName: "PauseContainer", + Handler: _Execution_PauseContainer_Handler, }, { - MethodName: "Resume", - Handler: _Containers_Resume_Handler, + MethodName: "ResumeContainer", + Handler: _Execution_ResumeContainer_Handler, }, { MethodName: "ContainerList", - Handler: _Containers_ContainerList_Handler, + Handler: _Execution_ContainerList_Handler, }, { MethodName: "CreateProcess", - Handler: _Containers_CreateProcess_Handler, + Handler: _Execution_CreateProcess_Handler, }, { MethodName: "StartProcess", - Handler: _Containers_StartProcess_Handler, + Handler: _Execution_StartProcess_Handler, }, { MethodName: "ProcessState", - Handler: _Containers_ProcessState_Handler, + Handler: _Execution_ProcessState_Handler, }, { MethodName: "SignalProcess", - Handler: _Containers_SignalProcess_Handler, + Handler: _Execution_SignalProcess_Handler, }, { MethodName: "DeleteProcess", - Handler: _Containers_DeleteProcess_Handler, + Handler: _Execution_DeleteProcess_Handler, }, { MethodName: "ProcessList", - Handler: _Containers_ProcessList_Handler, + Handler: _Execution_ProcessList_Handler, }, }, Streams: []grpc.StreamDesc{ { StreamName: "Events", - Handler: _Containers_Events_Handler, + Handler: _Execution_Events_Handler, ServerStreams: true, }, }, @@ -1637,57 +1618,6 @@ func (m *ProcessSpec) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *Mount) 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 *Mount) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - if len(m.Source) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.Source))) - i += copy(dAtA[i:], m.Source) - } - if len(m.Target) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.Target))) - i += copy(dAtA[i:], m.Target) - } - if len(m.Type) > 0 { - dAtA[i] = 0x1a - i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.Type))) - i += copy(dAtA[i:], m.Type) - } - if len(m.Options) > 0 { - for _, s := range m.Options { - dAtA[i] = 0x22 - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) - } - } - return i, nil -} - func (m *User) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1733,7 +1663,7 @@ func (m *User) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *CreateRequest) Marshal() (dAtA []byte, err error) { +func (m *CreateContainerRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -1743,7 +1673,7 @@ func (m *CreateRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *CreateRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *CreateContainerRequest) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -1791,7 +1721,7 @@ func (m *CreateRequest) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *CreateResponse) Marshal() (dAtA []byte, err error) { +func (m *CreateContainerResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -1801,7 +1731,7 @@ func (m *CreateResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *CreateResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *CreateContainerResponse) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -1819,7 +1749,7 @@ func (m *CreateResponse) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *StartRequest) Marshal() (dAtA []byte, err error) { +func (m *StartContainerRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -1829,7 +1759,7 @@ func (m *StartRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *StartRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *StartContainerRequest) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -1861,7 +1791,7 @@ func (m *State) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *StartResponse) Marshal() (dAtA []byte, err error) { +func (m *StartContainerResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -1871,7 +1801,7 @@ func (m *StartResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *StartResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *StartContainerResponse) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -1889,7 +1819,7 @@ func (m *StartResponse) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *DeleteRequest) Marshal() (dAtA []byte, err error) { +func (m *DeleteContainerRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -1899,7 +1829,7 @@ func (m *DeleteRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *DeleteRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *DeleteContainerRequest) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -1913,7 +1843,7 @@ func (m *DeleteRequest) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *DeleteResponse) Marshal() (dAtA []byte, err error) { +func (m *DeleteContainerResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -1923,7 +1853,7 @@ func (m *DeleteResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *DeleteResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *DeleteContainerResponse) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -1994,7 +1924,7 @@ func (m *ContainerListResponse) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *StateRequest) Marshal() (dAtA []byte, err error) { +func (m *StateContainerRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2004,7 +1934,7 @@ func (m *StateRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *StateRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *StateContainerRequest) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2018,7 +1948,7 @@ func (m *StateRequest) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *StateResponse) Marshal() (dAtA []byte, err error) { +func (m *StateContainerResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2028,7 +1958,7 @@ func (m *StateResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *StateResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *StateContainerResponse) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2046,7 +1976,7 @@ func (m *StateResponse) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *UpdateRequest) Marshal() (dAtA []byte, err error) { +func (m *UpdateContainerRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2056,7 +1986,7 @@ func (m *UpdateRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *UpdateRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *UpdateContainerRequest) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2070,7 +2000,7 @@ func (m *UpdateRequest) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *UpdateResponse) Marshal() (dAtA []byte, err error) { +func (m *UpdateContainerResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2080,7 +2010,7 @@ func (m *UpdateResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *UpdateResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *UpdateContainerResponse) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2088,7 +2018,7 @@ func (m *UpdateResponse) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *PauseRequest) Marshal() (dAtA []byte, err error) { +func (m *PauseContainerRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2098,7 +2028,7 @@ func (m *PauseRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *PauseRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *PauseContainerRequest) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2112,7 +2042,7 @@ func (m *PauseRequest) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *PauseResponse) Marshal() (dAtA []byte, err error) { +func (m *PauseContainerResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2122,7 +2052,7 @@ func (m *PauseResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *PauseResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *PauseContainerResponse) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2130,7 +2060,7 @@ func (m *PauseResponse) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *ResumeRequest) Marshal() (dAtA []byte, err error) { +func (m *ResumeContainerRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2140,7 +2070,7 @@ func (m *ResumeRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ResumeRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *ResumeContainerRequest) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2154,7 +2084,7 @@ func (m *ResumeRequest) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *ResumeResponse) Marshal() (dAtA []byte, err error) { +func (m *ResumeContainerResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2164,7 +2094,7 @@ func (m *ResumeResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ResumeResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *ResumeContainerResponse) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2638,30 +2568,6 @@ func (m *ProcessSpec) Size() (n int) { return n } -func (m *Mount) Size() (n int) { - var l int - _ = l - l = len(m.Source) - if l > 0 { - n += 1 + l + sovExecution(uint64(l)) - } - l = len(m.Target) - if l > 0 { - n += 1 + l + sovExecution(uint64(l)) - } - l = len(m.Type) - if l > 0 { - n += 1 + l + sovExecution(uint64(l)) - } - if len(m.Options) > 0 { - for _, s := range m.Options { - l = len(s) - n += 1 + l + sovExecution(uint64(l)) - } - } - return n -} - func (m *User) Size() (n int) { var l int _ = l @@ -2681,7 +2587,7 @@ func (m *User) Size() (n int) { return n } -func (m *CreateRequest) Size() (n int) { +func (m *CreateContainerRequest) Size() (n int) { var l int _ = l l = len(m.ID) @@ -2709,7 +2615,7 @@ func (m *CreateRequest) Size() (n int) { return n } -func (m *CreateResponse) Size() (n int) { +func (m *CreateContainerResponse) Size() (n int) { var l int _ = l if m.Container != nil { @@ -2719,7 +2625,7 @@ func (m *CreateResponse) Size() (n int) { return n } -func (m *StartRequest) Size() (n int) { +func (m *StartContainerRequest) Size() (n int) { var l int _ = l l = len(m.ID) @@ -2735,7 +2641,7 @@ func (m *State) Size() (n int) { return n } -func (m *StartResponse) Size() (n int) { +func (m *StartContainerResponse) Size() (n int) { var l int _ = l if m.State != nil { @@ -2745,7 +2651,7 @@ func (m *StartResponse) Size() (n int) { return n } -func (m *DeleteRequest) Size() (n int) { +func (m *DeleteContainerRequest) Size() (n int) { var l int _ = l l = len(m.ID) @@ -2755,7 +2661,7 @@ func (m *DeleteRequest) Size() (n int) { return n } -func (m *DeleteResponse) Size() (n int) { +func (m *DeleteContainerResponse) Size() (n int) { var l int _ = l return n @@ -2785,7 +2691,7 @@ func (m *ContainerListResponse) Size() (n int) { return n } -func (m *StateRequest) Size() (n int) { +func (m *StateContainerRequest) Size() (n int) { var l int _ = l l = len(m.ID) @@ -2795,7 +2701,7 @@ func (m *StateRequest) Size() (n int) { return n } -func (m *StateResponse) Size() (n int) { +func (m *StateContainerResponse) Size() (n int) { var l int _ = l if m.Container != nil { @@ -2805,7 +2711,7 @@ func (m *StateResponse) Size() (n int) { return n } -func (m *UpdateRequest) Size() (n int) { +func (m *UpdateContainerRequest) Size() (n int) { var l int _ = l l = len(m.ID) @@ -2815,13 +2721,13 @@ func (m *UpdateRequest) Size() (n int) { return n } -func (m *UpdateResponse) Size() (n int) { +func (m *UpdateContainerResponse) Size() (n int) { var l int _ = l return n } -func (m *PauseRequest) Size() (n int) { +func (m *PauseContainerRequest) Size() (n int) { var l int _ = l l = len(m.ID) @@ -2831,13 +2737,13 @@ func (m *PauseRequest) Size() (n int) { return n } -func (m *PauseResponse) Size() (n int) { +func (m *PauseContainerResponse) Size() (n int) { var l int _ = l return n } -func (m *ResumeRequest) Size() (n int) { +func (m *ResumeContainerRequest) Size() (n int) { var l int _ = l l = len(m.ID) @@ -2847,7 +2753,7 @@ func (m *ResumeRequest) Size() (n int) { return n } -func (m *ResumeResponse) Size() (n int) { +func (m *ResumeContainerResponse) Size() (n int) { var l int _ = l return n @@ -3010,7 +2916,7 @@ func (this *Container) String() string { } s := strings.Join([]string{`&Container{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, - `Mounts:` + strings.Replace(fmt.Sprintf("%v", this.Mounts), "Mount", "Mount", 1) + `,`, + `Mounts:` + strings.Replace(fmt.Sprintf("%v", this.Mounts), "Mount", "containerd_v1.Mount", 1) + `,`, `Owner:` + fmt.Sprintf("%v", this.Owner) + `,`, `Process:` + strings.Replace(fmt.Sprintf("%v", this.Process), "Process", "Process", 1) + `,`, `}`, @@ -3049,19 +2955,6 @@ func (this *ProcessSpec) String() string { }, "") return s } -func (this *Mount) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&Mount{`, - `Source:` + fmt.Sprintf("%v", this.Source) + `,`, - `Target:` + fmt.Sprintf("%v", this.Target) + `,`, - `Type:` + fmt.Sprintf("%v", this.Type) + `,`, - `Options:` + fmt.Sprintf("%v", this.Options) + `,`, - `}`, - }, "") - return s -} func (this *User) String() string { if this == nil { return "nil" @@ -3074,35 +2967,35 @@ func (this *User) String() string { }, "") return s } -func (this *CreateRequest) String() string { +func (this *CreateContainerRequest) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&CreateRequest{`, + s := strings.Join([]string{`&CreateContainerRequest{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `Process:` + strings.Replace(fmt.Sprintf("%v", this.Process), "ProcessSpec", "ProcessSpec", 1) + `,`, - `Mounts:` + strings.Replace(fmt.Sprintf("%v", this.Mounts), "Mount", "Mount", 1) + `,`, + `Mounts:` + strings.Replace(fmt.Sprintf("%v", this.Mounts), "Mount", "containerd_v1.Mount", 1) + `,`, `Owner:` + fmt.Sprintf("%v", this.Owner) + `,`, `ConfigPath:` + fmt.Sprintf("%v", this.ConfigPath) + `,`, `}`, }, "") return s } -func (this *CreateResponse) String() string { +func (this *CreateContainerResponse) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&CreateResponse{`, + s := strings.Join([]string{`&CreateContainerResponse{`, `Container:` + strings.Replace(fmt.Sprintf("%v", this.Container), "Container", "Container", 1) + `,`, `}`, }, "") return s } -func (this *StartRequest) String() string { +func (this *StartContainerRequest) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&StartRequest{`, + s := strings.Join([]string{`&StartContainerRequest{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `}`, }, "") @@ -3117,31 +3010,31 @@ func (this *State) String() string { }, "") return s } -func (this *StartResponse) String() string { +func (this *StartContainerResponse) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&StartResponse{`, + s := strings.Join([]string{`&StartContainerResponse{`, `State:` + strings.Replace(fmt.Sprintf("%v", this.State), "State", "State", 1) + `,`, `}`, }, "") return s } -func (this *DeleteRequest) String() string { +func (this *DeleteContainerRequest) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&DeleteRequest{`, + s := strings.Join([]string{`&DeleteContainerRequest{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `}`, }, "") return s } -func (this *DeleteResponse) String() string { +func (this *DeleteContainerResponse) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&DeleteResponse{`, + s := strings.Join([]string{`&DeleteContainerResponse{`, `}`, }, "") return s @@ -3166,79 +3059,79 @@ func (this *ContainerListResponse) String() string { }, "") return s } -func (this *StateRequest) String() string { +func (this *StateContainerRequest) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&StateRequest{`, + s := strings.Join([]string{`&StateContainerRequest{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `}`, }, "") return s } -func (this *StateResponse) String() string { +func (this *StateContainerResponse) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&StateResponse{`, + s := strings.Join([]string{`&StateContainerResponse{`, `Container:` + strings.Replace(fmt.Sprintf("%v", this.Container), "Container", "Container", 1) + `,`, `}`, }, "") return s } -func (this *UpdateRequest) String() string { +func (this *UpdateContainerRequest) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&UpdateRequest{`, + s := strings.Join([]string{`&UpdateContainerRequest{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `}`, }, "") return s } -func (this *UpdateResponse) String() string { +func (this *UpdateContainerResponse) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&UpdateResponse{`, + s := strings.Join([]string{`&UpdateContainerResponse{`, `}`, }, "") return s } -func (this *PauseRequest) String() string { +func (this *PauseContainerRequest) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&PauseRequest{`, + s := strings.Join([]string{`&PauseContainerRequest{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `}`, }, "") return s } -func (this *PauseResponse) String() string { +func (this *PauseContainerResponse) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&PauseResponse{`, + s := strings.Join([]string{`&PauseContainerResponse{`, `}`, }, "") return s } -func (this *ResumeRequest) String() string { +func (this *ResumeContainerRequest) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&ResumeRequest{`, + s := strings.Join([]string{`&ResumeContainerRequest{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `}`, }, "") return s } -func (this *ResumeResponse) String() string { +func (this *ResumeContainerResponse) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&ResumeResponse{`, + s := strings.Join([]string{`&ResumeContainerResponse{`, `}`, }, "") return s @@ -3475,7 +3368,7 @@ func (m *Container) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Mounts = append(m.Mounts, &Mount{}) + m.Mounts = append(m.Mounts, &containerd_v1.Mount{}) if err := m.Mounts[len(m.Mounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -4049,172 +3942,6 @@ func (m *ProcessSpec) Unmarshal(dAtA []byte) error { } return nil } -func (m *Mount) 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 ErrIntOverflowExecution - } - 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: Mount: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Mount: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Source", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowExecution - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthExecution - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Source = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Target", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowExecution - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthExecution - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Target = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowExecution - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthExecution - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Type = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Options", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowExecution - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthExecution - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Options = append(m.Options, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthExecution - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *User) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4365,7 +4092,7 @@ func (m *User) Unmarshal(dAtA []byte) error { } return nil } -func (m *CreateRequest) Unmarshal(dAtA []byte) error { +func (m *CreateContainerRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4388,10 +4115,10 @@ func (m *CreateRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: CreateRequest: wiretype end group for non-group") + return fmt.Errorf("proto: CreateContainerRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: CreateRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: CreateContainerRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4482,7 +4209,7 @@ func (m *CreateRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Mounts = append(m.Mounts, &Mount{}) + m.Mounts = append(m.Mounts, &containerd_v1.Mount{}) if err := m.Mounts[len(m.Mounts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -4566,7 +4293,7 @@ func (m *CreateRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *CreateResponse) Unmarshal(dAtA []byte) error { +func (m *CreateContainerResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4589,10 +4316,10 @@ func (m *CreateResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: CreateResponse: wiretype end group for non-group") + return fmt.Errorf("proto: CreateContainerResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: CreateResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: CreateContainerResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4649,7 +4376,7 @@ func (m *CreateResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *StartRequest) Unmarshal(dAtA []byte) error { +func (m *StartContainerRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4672,10 +4399,10 @@ func (m *StartRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: StartRequest: wiretype end group for non-group") + return fmt.Errorf("proto: StartContainerRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: StartRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: StartContainerRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4778,7 +4505,7 @@ func (m *State) Unmarshal(dAtA []byte) error { } return nil } -func (m *StartResponse) Unmarshal(dAtA []byte) error { +func (m *StartContainerResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4801,10 +4528,10 @@ func (m *StartResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: StartResponse: wiretype end group for non-group") + return fmt.Errorf("proto: StartContainerResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: StartResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: StartContainerResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4861,7 +4588,7 @@ func (m *StartResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *DeleteRequest) Unmarshal(dAtA []byte) error { +func (m *DeleteContainerRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4884,10 +4611,10 @@ func (m *DeleteRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: DeleteRequest: wiretype end group for non-group") + return fmt.Errorf("proto: DeleteContainerRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: DeleteRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: DeleteContainerRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4940,7 +4667,7 @@ func (m *DeleteRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *DeleteResponse) Unmarshal(dAtA []byte) error { +func (m *DeleteContainerResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4963,10 +4690,10 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: DeleteResponse: wiretype end group for non-group") + return fmt.Errorf("proto: DeleteContainerResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: DeleteResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: DeleteContainerResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -5150,7 +4877,7 @@ func (m *ContainerListResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *StateRequest) Unmarshal(dAtA []byte) error { +func (m *StateContainerRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5173,10 +4900,10 @@ func (m *StateRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: StateRequest: wiretype end group for non-group") + return fmt.Errorf("proto: StateContainerRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: StateRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: StateContainerRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5229,7 +4956,7 @@ func (m *StateRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *StateResponse) Unmarshal(dAtA []byte) error { +func (m *StateContainerResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5252,10 +4979,10 @@ func (m *StateResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: StateResponse: wiretype end group for non-group") + return fmt.Errorf("proto: StateContainerResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: StateResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: StateContainerResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5312,7 +5039,7 @@ func (m *StateResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *UpdateRequest) Unmarshal(dAtA []byte) error { +func (m *UpdateContainerRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5335,10 +5062,10 @@ func (m *UpdateRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UpdateRequest: wiretype end group for non-group") + return fmt.Errorf("proto: UpdateContainerRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UpdateRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: UpdateContainerRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5391,7 +5118,7 @@ func (m *UpdateRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *UpdateResponse) Unmarshal(dAtA []byte) error { +func (m *UpdateContainerResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5414,10 +5141,10 @@ func (m *UpdateResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UpdateResponse: wiretype end group for non-group") + return fmt.Errorf("proto: UpdateContainerResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UpdateResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: UpdateContainerResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -5441,7 +5168,7 @@ func (m *UpdateResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *PauseRequest) Unmarshal(dAtA []byte) error { +func (m *PauseContainerRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5464,10 +5191,10 @@ func (m *PauseRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: PauseRequest: wiretype end group for non-group") + return fmt.Errorf("proto: PauseContainerRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: PauseRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: PauseContainerRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5520,7 +5247,7 @@ func (m *PauseRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *PauseResponse) Unmarshal(dAtA []byte) error { +func (m *PauseContainerResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5543,10 +5270,10 @@ func (m *PauseResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: PauseResponse: wiretype end group for non-group") + return fmt.Errorf("proto: PauseContainerResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: PauseResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: PauseContainerResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -5570,7 +5297,7 @@ func (m *PauseResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *ResumeRequest) Unmarshal(dAtA []byte) error { +func (m *ResumeContainerRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5593,10 +5320,10 @@ func (m *ResumeRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ResumeRequest: wiretype end group for non-group") + return fmt.Errorf("proto: ResumeContainerRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ResumeRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: ResumeContainerRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5649,7 +5376,7 @@ func (m *ResumeRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *ResumeResponse) Unmarshal(dAtA []byte) error { +func (m *ResumeContainerResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5672,10 +5399,10 @@ func (m *ResumeResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ResumeResponse: wiretype end group for non-group") + return fmt.Errorf("proto: ResumeContainerResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ResumeResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: ResumeContainerResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -6901,71 +6628,70 @@ var ( func init() { proto.RegisterFile("execution.proto", fileDescriptorExecution) } var fileDescriptorExecution = []byte{ - // 1053 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x57, 0xdd, 0x6e, 0xdc, 0x44, - 0x14, 0xae, 0xf7, 0x37, 0x7b, 0xb6, 0x4e, 0xab, 0x89, 0x93, 0x5a, 0x4b, 0xd8, 0x86, 0x29, 0x4a, - 0x56, 0xa8, 0x5a, 0x4a, 0x40, 0x88, 0xc2, 0x5d, 0xda, 0x28, 0x20, 0x81, 0x14, 0x26, 0x44, 0x48, - 0xbd, 0x00, 0x19, 0x7b, 0xd8, 0x5a, 0x4a, 0x6c, 0x33, 0x1e, 0xa7, 0x70, 0xc7, 0x63, 0xc0, 0x83, - 0xf0, 0x02, 0x5c, 0xf5, 0xb2, 0x97, 0x5c, 0x21, 0xb2, 0x4f, 0xc0, 0x23, 0xa0, 0xf9, 0xb1, 0xd7, - 0xf6, 0x38, 0xbb, 0xdb, 0x8a, 0xbb, 0x99, 0x33, 0x67, 0xce, 0xf9, 0xe6, 0x9c, 0xef, 0x7c, 0xde, - 0x85, 0x3b, 0xf4, 0x67, 0xea, 0x67, 0x3c, 0x8c, 0xa3, 0x69, 0xc2, 0x62, 0x1e, 0x23, 0xdb, 0x8f, - 0x23, 0xee, 0x85, 0x11, 0x65, 0xc1, 0xf4, 0xea, 0x83, 0x91, 0x33, 0x8b, 0x67, 0xb1, 0x3c, 0x79, - 0x5f, 0xac, 0x94, 0x13, 0xfe, 0xdd, 0x82, 0xc1, 0x93, 0xdc, 0x0f, 0xed, 0x40, 0x2b, 0x0c, 0x5c, - 0x6b, 0xcf, 0x9a, 0x0c, 0x8e, 0x7a, 0xf3, 0xbf, 0xef, 0xb7, 0xbe, 0x78, 0x4a, 0x5a, 0x61, 0x80, - 0x1e, 0x42, 0xef, 0x32, 0xce, 0x22, 0x9e, 0xba, 0xad, 0xbd, 0xf6, 0x64, 0x78, 0xe8, 0x4c, 0x2b, - 0xb1, 0xa7, 0x5f, 0x89, 0x43, 0xa2, 0x7d, 0x90, 0x03, 0xdd, 0xf8, 0x45, 0x44, 0x99, 0xdb, 0x16, - 0x81, 0x88, 0xda, 0xa0, 0x47, 0xd0, 0x4f, 0x58, 0xec, 0xd3, 0x34, 0x75, 0x3b, 0x7b, 0xd6, 0x64, - 0x78, 0xb8, 0x53, 0x0b, 0x72, 0xaa, 0x4e, 0x49, 0xee, 0x86, 0x7f, 0xb3, 0xa0, 0xaf, 0x8d, 0xe8, - 0x2e, 0xb4, 0x13, 0x0d, 0xad, 0x43, 0xc4, 0x12, 0x21, 0xe8, 0x78, 0x6c, 0xa6, 0x10, 0x0d, 0x88, - 0x5c, 0x0b, 0x2f, 0x1a, 0x5d, 0xb9, 0x6d, 0x69, 0x12, 0x4b, 0x74, 0x00, 0x9d, 0x2c, 0xa5, 0x4c, - 0xa7, 0xdc, 0xaa, 0xa5, 0x3c, 0x4f, 0x29, 0x23, 0xd2, 0x41, 0x5c, 0xf5, 0x5f, 0x04, 0x6e, 0x57, - 0x42, 0x16, 0x4b, 0x34, 0x82, 0x0d, 0x4e, 0xd9, 0x65, 0x18, 0x79, 0x17, 0x6e, 0x6f, 0xcf, 0x9a, - 0x6c, 0x90, 0x62, 0x8f, 0x5f, 0x59, 0x30, 0xd4, 0xd0, 0xce, 0x12, 0xea, 0x17, 0x60, 0x2c, 0x13, - 0x4c, 0xcb, 0x04, 0xd3, 0x5e, 0x13, 0x4c, 0xa7, 0x19, 0x4c, 0xb7, 0x0a, 0x46, 0xd4, 0x3b, 0xe5, - 0x41, 0x18, 0x49, 0x94, 0x03, 0xa2, 0x36, 0x68, 0x07, 0x7a, 0x29, 0x0f, 0xe2, 0x8c, 0xbb, 0x7d, - 0x69, 0xd6, 0x3b, 0x6d, 0xa7, 0x8c, 0xb9, 0x1b, 0x85, 0x9d, 0x32, 0x86, 0x29, 0x74, 0x65, 0x1b, - 0xa5, 0x43, 0x9c, 0x31, 0x9f, 0x2a, 0x22, 0x10, 0xbd, 0x13, 0x76, 0xee, 0xb1, 0x19, 0xe5, 0x6e, - 0x4b, 0xd9, 0xd5, 0x4e, 0xbc, 0x9d, 0xff, 0x92, 0x50, 0xdd, 0x6d, 0xb9, 0x46, 0x2e, 0xf4, 0xe3, - 0x44, 0x70, 0x51, 0x34, 0x5b, 0xbc, 0x3f, 0xdf, 0x62, 0x02, 0x9d, 0x73, 0xfd, 0xc4, 0x4c, 0x37, - 0xd4, 0x26, 0x62, 0x29, 0x2c, 0xb3, 0x30, 0x90, 0xc1, 0x6d, 0x22, 0x96, 0x68, 0x1f, 0x36, 0xbd, - 0x20, 0x08, 0xc5, 0x45, 0xef, 0xe2, 0x24, 0x0c, 0x52, 0xd9, 0x59, 0x9b, 0xd4, 0xac, 0xf8, 0x4f, - 0x0b, 0xec, 0x27, 0x8c, 0x7a, 0x9c, 0x12, 0xfa, 0x53, 0x46, 0x53, 0x7e, 0x23, 0x91, 0x3f, 0x5a, - 0x90, 0xb0, 0x25, 0x9b, 0x30, 0x6a, 0x26, 0xa1, 0x68, 0x6a, 0x41, 0xc4, 0x12, 0xfd, 0xdb, 0xaf, - 0x43, 0xff, 0x4e, 0x99, 0xfe, 0xf7, 0x61, 0xe8, 0xc7, 0xd1, 0x8f, 0xe1, 0xec, 0xfb, 0xc4, 0xe3, - 0xcf, 0x35, 0xcf, 0x40, 0x99, 0x4e, 0x3d, 0xfe, 0x1c, 0x7f, 0x0e, 0x9b, 0xf9, 0x1b, 0xd2, 0x24, - 0x8e, 0x52, 0x8a, 0x3e, 0x86, 0x41, 0x91, 0x47, 0xbe, 0x65, 0x78, 0xe8, 0xd6, 0x32, 0x17, 0xa3, - 0x4b, 0x16, 0xae, 0x78, 0x1f, 0x6e, 0x9f, 0x71, 0x8f, 0xf1, 0x15, 0xc5, 0xc0, 0x7d, 0xe8, 0x9e, - 0x71, 0x8f, 0x53, 0xfc, 0x19, 0xd8, 0xfa, 0x82, 0xce, 0xfc, 0x9e, 0x60, 0x94, 0xc7, 0xa9, 0xce, - 0x5a, 0x7f, 0xaf, 0xbc, 0x45, 0x94, 0x0b, 0x3e, 0x00, 0xfb, 0x29, 0xbd, 0xa0, 0x2b, 0x6b, 0x8f, - 0xef, 0xc2, 0x66, 0xee, 0xa8, 0xd2, 0xe0, 0x87, 0xe0, 0x14, 0x0f, 0xf8, 0x32, 0x4c, 0x0b, 0xc0, - 0x45, 0x05, 0xd5, 0x38, 0xa9, 0x0d, 0xfe, 0x1a, 0xb6, 0x6b, 0xde, 0x1a, 0xed, 0x27, 0x00, 0x05, - 0x3e, 0x35, 0x82, 0xcb, 0x0a, 0x55, 0xf2, 0xd5, 0x95, 0x5a, 0x0d, 0xfd, 0x44, 0x16, 0xe8, 0x7f, - 0x68, 0xcd, 0x01, 0xd8, 0xe7, 0x49, 0xe0, 0xad, 0x55, 0xac, 0xdc, 0x51, 0x17, 0x6b, 0x1f, 0x6e, - 0x9f, 0x7a, 0x59, 0xba, 0xf2, 0xe6, 0x1d, 0xb0, 0xb5, 0x9f, 0xbe, 0x78, 0x00, 0x36, 0xa1, 0x69, - 0x76, 0xb9, 0x4e, 0xce, 0xdc, 0x51, 0x5f, 0xfd, 0x0e, 0x1c, 0xc5, 0xc9, 0x5c, 0x9b, 0x57, 0x8c, - 0xd7, 0x14, 0x3a, 0x69, 0x42, 0xfd, 0x35, 0x66, 0x4b, 0xfa, 0xe1, 0x7b, 0xb0, 0x5d, 0x8b, 0xaf, - 0x13, 0x3f, 0x86, 0x2d, 0xc9, 0xc8, 0x5a, 0x5e, 0xa1, 0x8b, 0x79, 0x62, 0x22, 0x96, 0xf9, 0x77, - 0x41, 0x29, 0x92, 0x58, 0xe2, 0x09, 0x38, 0xd5, 0xab, 0xba, 0x65, 0xa5, 0x2f, 0x88, 0xad, 0x3c, - 0x1f, 0xc3, 0x56, 0x0e, 0xa9, 0x4c, 0x82, 0x75, 0x92, 0x1c, 0x81, 0x53, 0xbd, 0xfa, 0x06, 0x83, - 0x43, 0xc0, 0x39, 0x0b, 0x67, 0x91, 0x77, 0xf1, 0xfa, 0x8f, 0x94, 0x1a, 0x2d, 0xef, 0x4a, 0xd5, - 0xb5, 0x89, 0xde, 0x89, 0x82, 0xd6, 0x62, 0xea, 0x82, 0x7e, 0x0a, 0x8e, 0x1a, 0xbe, 0x37, 0xa8, - 0xe8, 0x3d, 0xd8, 0xae, 0xdd, 0x2d, 0xe6, 0x17, 0x69, 0x53, 0x79, 0x7a, 0x6f, 0xa2, 0xd7, 0x76, - 0x51, 0xee, 0xf2, 0xf4, 0x0a, 0xbe, 0x1e, 0x5f, 0xd1, 0x88, 0xe7, 0x90, 0x04, 0x0d, 0x73, 0x83, - 0x72, 0x39, 0xfc, 0x63, 0x00, 0x50, 0x8c, 0x53, 0x8a, 0x8e, 0xa1, 0xa7, 0x58, 0x83, 0x76, 0xeb, - 0x33, 0x57, 0xfe, 0x08, 0x8c, 0xde, 0xbe, 0xe1, 0x54, 0xf7, 0xea, 0x48, 0xca, 0x1f, 0xe3, 0xe8, - 0x2d, 0xb3, 0x4b, 0x85, 0x78, 0x8e, 0x76, 0x9b, 0x0f, 0x75, 0x8c, 0x63, 0xe8, 0xa9, 0xd2, 0x18, - 0x50, 0x2a, 0x9a, 0x68, 0x40, 0xa9, 0x0a, 0xa1, 0x86, 0xc2, 0x69, 0x13, 0x94, 0x45, 0x90, 0xdd, - 0xe6, 0xc3, 0x05, 0x14, 0xa5, 0x18, 0x06, 0x94, 0x8a, 0xe2, 0x18, 0x50, 0xaa, 0x32, 0x23, 0xa0, - 0x48, 0xf9, 0x30, 0xa0, 0x94, 0xc5, 0xc7, 0x80, 0x52, 0x51, 0x1c, 0x01, 0x45, 0x09, 0x89, 0x01, - 0xa5, 0x22, 0x44, 0x06, 0x94, 0xaa, 0xfa, 0xa0, 0x67, 0x60, 0x57, 0x04, 0x1f, 0x3d, 0xb8, 0x49, - 0x62, 0x4b, 0xf4, 0x1b, 0xbd, 0xbb, 0xdc, 0xa9, 0x14, 0xbb, 0xac, 0x3c, 0x66, 0xec, 0x06, 0xdd, - 0x33, 0x63, 0x37, 0x89, 0x17, 0xfa, 0x56, 0x7f, 0x7f, 0xf3, 0xd0, 0xb8, 0x89, 0x42, 0xb5, 0xc8, - 0x0f, 0x96, 0xfa, 0x2c, 0x02, 0x97, 0x55, 0xc7, 0x08, 0xdc, 0xa0, 0x66, 0x46, 0xe0, 0x46, 0xd9, - 0x7a, 0x06, 0x76, 0x45, 0x36, 0x8c, 0x6a, 0x34, 0x09, 0x95, 0x51, 0x8d, 0x46, 0xe5, 0x11, 0xb1, - 0x2b, 0xea, 0x61, 0xc4, 0x6e, 0xd2, 0x25, 0x23, 0x76, 0xa3, 0x00, 0xa1, 0x6f, 0x8a, 0x5f, 0xe1, - 0x92, 0x1f, 0xef, 0x34, 0xbf, 0xb5, 0xcc, 0x0e, 0xbc, 0xcc, 0x45, 0x47, 0x3d, 0x81, 0x9e, 0x12, - 0x20, 0x83, 0xbe, 0x15, 0xa1, 0x32, 0xe8, 0x5b, 0x55, 0xad, 0x47, 0xd6, 0xd1, 0xee, 0xcb, 0xeb, - 0xf1, 0xad, 0xbf, 0xae, 0xc7, 0xb7, 0xfe, 0xbd, 0x1e, 0x5b, 0xbf, 0xce, 0xc7, 0xd6, 0xcb, 0xf9, - 0xd8, 0x7a, 0x35, 0x1f, 0x5b, 0xff, 0xcc, 0xc7, 0xd6, 0x0f, 0x3d, 0xf9, 0x0f, 0xec, 0xc3, 0xff, - 0x02, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x07, 0x08, 0x35, 0xb9, 0x0d, 0x00, 0x00, + // 1036 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x57, 0x5f, 0x6f, 0x1b, 0x45, + 0x10, 0xef, 0xd9, 0x8e, 0x13, 0x8f, 0x71, 0x5c, 0x6d, 0x6c, 0xe7, 0xb0, 0x8a, 0x1b, 0xb6, 0x69, + 0xb1, 0x50, 0xe5, 0x98, 0x80, 0x10, 0xe5, 0x31, 0x4d, 0x55, 0x21, 0x81, 0x94, 0x6e, 0x88, 0x90, + 0x2a, 0x01, 0x39, 0x7c, 0x8b, 0x7b, 0x52, 0x72, 0x77, 0xdc, 0xad, 0x53, 0x1e, 0xf9, 0x18, 0xf0, + 0x8d, 0x2a, 0xf1, 0xd2, 0x47, 0x9e, 0x10, 0xf1, 0x27, 0x80, 0x6f, 0x80, 0xf6, 0xcf, 0x5d, 0xee, + 0x76, 0xd7, 0x89, 0x1d, 0xf5, 0x25, 0xda, 0x9d, 0x9b, 0xf9, 0xcd, 0xcc, 0x6f, 0x67, 0x7f, 0x1b, + 0x43, 0x9b, 0xfe, 0x4a, 0x27, 0x33, 0x16, 0x44, 0xe1, 0x28, 0x4e, 0x22, 0x16, 0xa1, 0xd6, 0x24, + 0x0a, 0x99, 0x17, 0x84, 0x34, 0xf1, 0x47, 0x17, 0x9f, 0xf4, 0xbb, 0x5e, 0x1c, 0xec, 0x9d, 0x47, + 0xb3, 0x90, 0xc9, 0xbf, 0xd2, 0xab, 0xdf, 0x99, 0x46, 0xd3, 0x48, 0x2c, 0xf7, 0xf8, 0x4a, 0x5a, + 0xf1, 0x1f, 0x0e, 0x34, 0x9e, 0x66, 0xe1, 0xa8, 0x07, 0x95, 0xc0, 0x77, 0x9d, 0x1d, 0x67, 0xd8, + 0x38, 0xa8, 0xcf, 0xff, 0xbe, 0x5f, 0xf9, 0xea, 0x90, 0x54, 0x02, 0x1f, 0x3d, 0x86, 0xba, 0x80, + 0x4a, 0xdd, 0xca, 0x4e, 0x75, 0xd8, 0xdc, 0xef, 0x8c, 0x4a, 0x29, 0x47, 0xdf, 0xf0, 0x8f, 0x44, + 0xf9, 0xa0, 0x0e, 0xac, 0x45, 0xaf, 0x43, 0x9a, 0xb8, 0x55, 0x0e, 0x44, 0xe4, 0x06, 0x8d, 0x61, + 0x3d, 0x4e, 0xa2, 0x09, 0x4d, 0x53, 0xb7, 0xb6, 0xe3, 0x0c, 0x9b, 0xfb, 0x3d, 0x0d, 0xe4, 0x48, + 0x7e, 0x25, 0x99, 0x1b, 0xfe, 0xdd, 0x81, 0x75, 0x65, 0x44, 0x77, 0xa1, 0x1a, 0xab, 0xd2, 0x6a, + 0x84, 0x2f, 0x11, 0x82, 0x9a, 0x97, 0x4c, 0x65, 0x45, 0x0d, 0x22, 0xd6, 0xdc, 0x8b, 0x86, 0x17, + 0x6e, 0x55, 0x98, 0xf8, 0x12, 0x7d, 0x04, 0xb5, 0x59, 0x4a, 0x13, 0x95, 0x72, 0x4b, 0x4b, 0x79, + 0x92, 0xd2, 0x84, 0x08, 0x07, 0x1e, 0x3a, 0x79, 0xed, 0xbb, 0x6b, 0xa2, 0x64, 0xbe, 0x44, 0x7d, + 0xd8, 0x60, 0x34, 0x39, 0x0f, 0x42, 0xef, 0xcc, 0xad, 0xef, 0x38, 0xc3, 0x0d, 0x92, 0xef, 0xf1, + 0x5b, 0x07, 0x9a, 0xaa, 0xb4, 0xe3, 0x98, 0x4e, 0xf2, 0x62, 0x1c, 0xb3, 0x98, 0x8a, 0x59, 0x4c, + 0x75, 0xc9, 0x62, 0x6a, 0xf6, 0x62, 0xd6, 0xca, 0xc5, 0x70, 0xbe, 0x53, 0xe6, 0x07, 0xa1, 0xa8, + 0xb2, 0x41, 0xe4, 0x06, 0xf5, 0xa0, 0x9e, 0x32, 0x3f, 0x9a, 0x31, 0x77, 0x5d, 0x98, 0xd5, 0x4e, + 0xd9, 0x69, 0x92, 0xb8, 0x1b, 0xb9, 0x9d, 0x26, 0x09, 0x26, 0x50, 0x3b, 0x51, 0xb9, 0x67, 0x8a, + 0xe9, 0x16, 0xe1, 0x4b, 0x6e, 0x99, 0x06, 0xbe, 0x5b, 0x91, 0x96, 0x69, 0xe0, 0xa3, 0x47, 0xb0, + 0xe9, 0xf9, 0x7e, 0xc0, 0x67, 0xd0, 0x3b, 0x7b, 0x1e, 0xf8, 0xa9, 0xa0, 0xbc, 0x45, 0x34, 0x2b, + 0xfe, 0xd3, 0x81, 0xde, 0xd3, 0x84, 0x7a, 0x8c, 0xe6, 0x33, 0x46, 0xe8, 0x2f, 0x33, 0x9a, 0xb2, + 0x85, 0xa3, 0xf6, 0xd9, 0xd5, 0x98, 0x54, 0x04, 0x4d, 0x7d, 0xfb, 0x98, 0x70, 0xda, 0xf3, 0x51, + 0x29, 0x0c, 0x68, 0x75, 0x95, 0x01, 0xad, 0x15, 0x07, 0xf4, 0x3e, 0x34, 0x27, 0x51, 0xf8, 0x73, + 0x30, 0xfd, 0x31, 0xf6, 0xd8, 0x2b, 0x35, 0x09, 0x20, 0x4d, 0x47, 0x1e, 0x7b, 0x85, 0x5f, 0xc0, + 0xb6, 0xd1, 0x4c, 0x1a, 0x47, 0x61, 0x4a, 0xd1, 0xe7, 0xd0, 0xc8, 0x13, 0x8a, 0xa6, 0x9a, 0xfb, + 0xae, 0x56, 0xc2, 0x55, 0xd0, 0x95, 0x2b, 0xde, 0x83, 0xee, 0x31, 0xf3, 0x12, 0xb6, 0x2c, 0x3d, + 0x78, 0x1d, 0xd6, 0x8e, 0x99, 0xc7, 0x28, 0x3e, 0x84, 0x9e, 0x1e, 0xa9, 0x6a, 0xf9, 0x98, 0x8f, + 0x83, 0xc7, 0xa8, 0xaa, 0x43, 0xa7, 0x42, 0x84, 0x13, 0xe9, 0x82, 0xc7, 0xd0, 0x3b, 0xa4, 0x67, + 0x74, 0xf9, 0xf3, 0xc1, 0xef, 0xc3, 0xb6, 0x11, 0x21, 0x13, 0xe3, 0xc7, 0xd0, 0xc9, 0x8d, 0x5f, + 0x07, 0x29, 0xcb, 0xa0, 0x72, 0xba, 0xe5, 0xed, 0x90, 0x1b, 0xfc, 0x02, 0xba, 0x9a, 0xb7, 0xaa, + 0xff, 0x0b, 0x80, 0xbc, 0x62, 0x79, 0xa3, 0xae, 0x23, 0xb3, 0xe0, 0xab, 0xd8, 0x5c, 0xa1, 0x99, + 0x23, 0x41, 0xe2, 0xbb, 0x3c, 0xd0, 0x31, 0xf4, 0x4e, 0x62, 0xdf, 0x5b, 0x8d, 0x50, 0x23, 0x42, + 0x11, 0xba, 0x07, 0xdd, 0x23, 0x6f, 0x96, 0x2e, 0x8f, 0xe5, 0x42, 0x4f, 0x0f, 0x50, 0x50, 0x63, + 0xe8, 0x11, 0x9a, 0xce, 0xce, 0x57, 0xaa, 0xcb, 0x88, 0x50, 0x60, 0x3f, 0x40, 0x47, 0x5e, 0x84, + 0x4c, 0xb2, 0x6f, 0xb8, 0xd3, 0x23, 0xa8, 0xa5, 0x31, 0x9d, 0x2c, 0x71, 0xa1, 0x85, 0x1f, 0xde, + 0x86, 0xae, 0x86, 0xaf, 0x12, 0x3f, 0x81, 0x2d, 0x31, 0xf4, 0x5a, 0x5e, 0x2e, 0x97, 0x59, 0x62, + 0xc2, 0x97, 0xd9, 0x73, 0x51, 0x91, 0x96, 0x38, 0xf0, 0xf1, 0x10, 0x3a, 0xe5, 0x50, 0x75, 0xd0, + 0x85, 0x87, 0xa5, 0x25, 0x3d, 0x9f, 0xc0, 0x56, 0x56, 0x92, 0xb8, 0x2a, 0x2b, 0x24, 0x39, 0x80, + 0x4e, 0x39, 0xf4, 0x16, 0x57, 0x92, 0x40, 0xe7, 0x38, 0x98, 0x86, 0xde, 0xd9, 0xea, 0x4d, 0x0a, + 0x6d, 0x17, 0xb1, 0xe2, 0x89, 0x69, 0x11, 0xb5, 0xe3, 0x84, 0x6a, 0x98, 0x8a, 0xd0, 0x2f, 0xa1, + 0x23, 0x6f, 0xf3, 0x2d, 0x18, 0xdd, 0x86, 0xae, 0x16, 0x9b, 0xeb, 0x00, 0x52, 0xa6, 0xa2, 0x0a, + 0x2c, 0x9a, 0xb3, 0x6e, 0x4e, 0x77, 0x51, 0x05, 0x70, 0x1b, 0x5a, 0xcf, 0x2e, 0x68, 0xc8, 0xb2, + 0x92, 0xf0, 0x5d, 0xd8, 0xcc, 0x0c, 0xd2, 0x65, 0xff, 0x3f, 0x80, 0xc6, 0xb3, 0xec, 0x7f, 0x21, + 0x74, 0x0a, 0x6d, 0x4d, 0x9d, 0xd1, 0x43, 0xfd, 0xc6, 0x5a, 0x9f, 0xa2, 0xfe, 0xa3, 0x9b, 0xdc, + 0xd4, 0x29, 0x7e, 0x0f, 0x9b, 0x65, 0xc9, 0x45, 0xbb, 0xe6, 0x41, 0x9a, 0x5a, 0xde, 0x7f, 0x78, + 0x83, 0x97, 0x82, 0x3f, 0x85, 0xb6, 0xa6, 0xac, 0x46, 0x03, 0x76, 0xad, 0x36, 0x1a, 0x58, 0x20, + 0xd0, 0xaa, 0x81, 0x62, 0x82, 0x5d, 0xdb, 0x24, 0x2e, 0xd3, 0x80, 0x0d, 0xfe, 0x14, 0xda, 0x9a, + 0x92, 0x19, 0x0d, 0xd8, 0xb5, 0xd1, 0x68, 0x60, 0x81, 0x20, 0xf2, 0x06, 0xca, 0xfa, 0x66, 0x34, + 0x60, 0xd5, 0x4b, 0xa3, 0x01, 0xbb, 0x48, 0xf2, 0x06, 0x34, 0xc9, 0x33, 0x1a, 0xb0, 0x8b, 0xa8, + 0xd1, 0xc0, 0x02, 0xe5, 0x44, 0x2f, 0xa1, 0x55, 0x7a, 0xf4, 0xd0, 0x83, 0x45, 0x8f, 0x4a, 0xe1, + 0xea, 0xf4, 0x77, 0xaf, 0x77, 0x2a, 0x60, 0x17, 0x55, 0xd3, 0xc4, 0xb6, 0x68, 0xb6, 0x89, 0x6d, + 0x13, 0x5e, 0xf4, 0x1d, 0xbc, 0x57, 0x54, 0x4f, 0x84, 0x6d, 0x23, 0xad, 0x21, 0x3f, 0xb8, 0xd6, + 0xe7, 0x0a, 0xb8, 0xa8, 0x98, 0x06, 0xb0, 0x45, 0x89, 0x0d, 0x60, 0xab, 0xe4, 0xbe, 0x84, 0x56, + 0x49, 0xf2, 0x0c, 0x36, 0x6c, 0x22, 0x6b, 0xb0, 0x61, 0x55, 0x4d, 0x8e, 0x5d, 0x52, 0x3e, 0x03, + 0xdb, 0xa6, 0xa9, 0x06, 0xb6, 0x55, 0x3c, 0xd1, 0xb7, 0xf9, 0x0f, 0x0b, 0x31, 0x1f, 0x1f, 0xda, + 0x7b, 0x2d, 0x4e, 0x07, 0xbe, 0xce, 0x45, 0xa1, 0x3e, 0x87, 0xba, 0x14, 0x4f, 0x74, 0x4f, 0xf3, + 0x2e, 0x89, 0x6c, 0xff, 0x83, 0x05, 0x5f, 0x25, 0xcc, 0xd8, 0x39, 0xb8, 0xf7, 0xe6, 0x72, 0x70, + 0xe7, 0xaf, 0xcb, 0xc1, 0x9d, 0x7f, 0x2f, 0x07, 0xce, 0x6f, 0xf3, 0x81, 0xf3, 0x66, 0x3e, 0x70, + 0xde, 0xce, 0x07, 0xce, 0x3f, 0xf3, 0x81, 0xf3, 0x53, 0x5d, 0xfc, 0xa8, 0xfc, 0xf4, 0xff, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xcf, 0x49, 0x76, 0x47, 0xa3, 0x0e, 0x00, 0x00, } diff --git a/api/execution/execution.proto b/api/execution/execution.proto index f5cf939..205340d 100644 --- a/api/execution/execution.proto +++ b/api/execution/execution.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package containerd.v1; +import "api/mount/mount.proto"; import "gogoproto/gogo.proto"; service Execution { @@ -52,13 +53,6 @@ message ProcessSpec { string stderr = 8; } -message Mount { - string source = 1; - string target = 2; - string type = 3; - repeated string options = 4; -} - message User { uint32 uid = 1; uint32 gid = 2; diff --git a/api/execution/gen.go b/api/execution/gen.go index 7347a67..f754b45 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 --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 +//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,Mapi/mount/mount.proto=github.com/docker/containerd/api/mount:. execution.proto diff --git a/api/mount/gen.go b/api/mount/gen.go new file mode 100644 index 0000000..4bbe526 --- /dev/null +++ b/api/mount/gen.go @@ -0,0 +1,3 @@ +package mount + +//go:generate protoc -I.:../../../../../github.com/gogo/protobuf:/usr/local/include --gogoctrd_out=plugins=grpc,import_path=github.com/docker/containerd/api/mount,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:. mount.proto diff --git a/api/mount/mount.pb.go b/api/mount/mount.pb.go new file mode 100644 index 0000000..8c72ca8 --- /dev/null +++ b/api/mount/mount.pb.go @@ -0,0 +1,515 @@ +// Code generated by protoc-gen-gogo. +// source: mount.proto +// DO NOT EDIT! + +/* + Package mount is a generated protocol buffer package. + + It is generated from these files: + mount.proto + + It has these top-level messages: + Mount +*/ +package mount + +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 + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + +type Mount struct { + Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` + Target string `protobuf:"bytes,2,opt,name=target,proto3" json:"target,omitempty"` + Source string `protobuf:"bytes,3,opt,name=source,proto3" json:"source,omitempty"` + Options []string `protobuf:"bytes,4,rep,name=options" json:"options,omitempty"` +} + +func (m *Mount) Reset() { *m = Mount{} } +func (*Mount) ProtoMessage() {} +func (*Mount) Descriptor() ([]byte, []int) { return fileDescriptorMount, []int{0} } + +func init() { + proto.RegisterType((*Mount)(nil), "containerd.v1.Mount") +} +func (this *Mount) GoString() string { + if this == nil { + return "nil" + } + s := make([]string, 0, 8) + s = append(s, "&mount.Mount{") + s = append(s, "Type: "+fmt.Sprintf("%#v", this.Type)+",\n") + s = append(s, "Target: "+fmt.Sprintf("%#v", this.Target)+",\n") + s = append(s, "Source: "+fmt.Sprintf("%#v", this.Source)+",\n") + s = append(s, "Options: "+fmt.Sprintf("%#v", this.Options)+",\n") + s = append(s, "}") + return strings.Join(s, "") +} +func valueToGoStringMount(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 extensionToGoStringMount(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 *Mount) 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 *Mount) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.Type) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintMount(dAtA, i, uint64(len(m.Type))) + i += copy(dAtA[i:], m.Type) + } + if len(m.Target) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintMount(dAtA, i, uint64(len(m.Target))) + i += copy(dAtA[i:], m.Target) + } + if len(m.Source) > 0 { + dAtA[i] = 0x1a + i++ + i = encodeVarintMount(dAtA, i, uint64(len(m.Source))) + i += copy(dAtA[i:], m.Source) + } + if len(m.Options) > 0 { + for _, s := range m.Options { + dAtA[i] = 0x22 + i++ + l = len(s) + for l >= 1<<7 { + dAtA[i] = uint8(uint64(l)&0x7f | 0x80) + l >>= 7 + i++ + } + dAtA[i] = uint8(l) + i++ + i += copy(dAtA[i:], s) + } + } + return i, nil +} + +func encodeFixed64Mount(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 encodeFixed32Mount(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 encodeVarintMount(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 *Mount) Size() (n int) { + var l int + _ = l + l = len(m.Type) + if l > 0 { + n += 1 + l + sovMount(uint64(l)) + } + l = len(m.Target) + if l > 0 { + n += 1 + l + sovMount(uint64(l)) + } + l = len(m.Source) + if l > 0 { + n += 1 + l + sovMount(uint64(l)) + } + if len(m.Options) > 0 { + for _, s := range m.Options { + l = len(s) + n += 1 + l + sovMount(uint64(l)) + } + } + return n +} + +func sovMount(x uint64) (n int) { + for { + n++ + x >>= 7 + if x == 0 { + break + } + } + return n +} +func sozMount(x uint64) (n int) { + return sovMount(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (this *Mount) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&Mount{`, + `Type:` + fmt.Sprintf("%v", this.Type) + `,`, + `Target:` + fmt.Sprintf("%v", this.Target) + `,`, + `Source:` + fmt.Sprintf("%v", this.Source) + `,`, + `Options:` + fmt.Sprintf("%v", this.Options) + `,`, + `}`, + }, "") + return s +} +func valueToStringMount(v interface{}) string { + rv := reflect.ValueOf(v) + if rv.IsNil() { + return "nil" + } + pv := reflect.Indirect(rv).Interface() + return fmt.Sprintf("*%v", pv) +} +func (m *Mount) 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 ErrIntOverflowMount + } + 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: Mount: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Mount: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMount + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthMount + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Type = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Target", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMount + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthMount + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Target = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Source", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMount + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthMount + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Source = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Options", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMount + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthMount + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Options = append(m.Options, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipMount(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthMount + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipMount(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, ErrIntOverflowMount + } + 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, ErrIntOverflowMount + } + 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, ErrIntOverflowMount + } + 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, ErrInvalidLengthMount + } + return iNdEx, nil + case 3: + for { + var innerWire uint64 + var start int = iNdEx + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowMount + } + 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 := skipMount(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 ( + ErrInvalidLengthMount = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowMount = fmt.Errorf("proto: integer overflow") +) + +func init() { proto.RegisterFile("mount.proto", fileDescriptorMount) } + +var fileDescriptorMount = []byte{ + // 174 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0xce, 0xcd, 0x2f, 0xcd, + 0x2b, 0xd1, 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, 0xa9, 0x5c, 0xac, 0xbe, 0x20, 0x3d, 0x42, 0x42, 0x5c, 0x2c, 0x25, 0x95, + 0x05, 0xa9, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x60, 0xb6, 0x90, 0x18, 0x17, 0x5b, 0x49, + 0x62, 0x51, 0x7a, 0x6a, 0x89, 0x04, 0x13, 0x58, 0x14, 0xca, 0x03, 0x89, 0x17, 0xe7, 0x97, 0x16, + 0x25, 0xa7, 0x4a, 0x30, 0x43, 0xc4, 0x21, 0x3c, 0x21, 0x09, 0x2e, 0xf6, 0xfc, 0x82, 0x92, 0xcc, + 0xfc, 0xbc, 0x62, 0x09, 0x16, 0x05, 0x66, 0x0d, 0xce, 0x20, 0x18, 0xd7, 0x49, 0xe6, 0xc4, 0x43, + 0x39, 0x86, 0x1b, 0x0f, 0xe5, 0x18, 0x3e, 0x3c, 0x94, 0x63, 0x6c, 0x78, 0x24, 0xc7, 0x78, 0xe2, + 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x26, 0xb1, 0x81, 0xdd, 0x62, + 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x07, 0xde, 0xe3, 0xbf, 0x00, 0x00, 0x00, +} diff --git a/api/mount/mount.proto b/api/mount/mount.proto new file mode 100644 index 0000000..a425012 --- /dev/null +++ b/api/mount/mount.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +package containerd.v1; + +import "gogoproto/gogo.proto"; + +message Mount { + string type = 1; + string target = 2; + string source = 3; + repeated string options = 4; +} diff --git a/api/registry/gen.go b/api/registry/gen.go index 49288c8..924ba96 100644 --- a/api/registry/gen.go +++ b/api/registry/gen.go @@ -1,3 +1,3 @@ package registry -//go:generate protoc -I.:../../../../../github.com/gogo/protobuf --gogoctrd_out=plugins=grpc,import_path=github.com/docker/containerd/api/registry,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:. registry.proto +//go:generate protoc -I.:../../../../../github.com/gogo/protobuf:/usr/local/include --gogoctrd_out=plugins=grpc,import_path=github.com/docker/containerd/api/registry,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:. registry.proto