From 2bee4ac5cd303eafeff36a6aad9b719dc4c26991 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Fri, 9 Dec 2016 11:32:45 -0800 Subject: [PATCH] Only use IDs for execution RPC requests Signed-off-by: Kenfe-Mickael Laventure --- api/execution/execution.pb.go | 494 +++++++++++++++------------------- api/execution/execution.proto | 18 +- cmd/ctr/exec.go | 8 +- execution/service.go | 16 +- 4 files changed, 232 insertions(+), 304 deletions(-) diff --git a/api/execution/execution.pb.go b/api/execution/execution.pb.go index 69f60ed..c5ba12d 100644 --- a/api/execution/execution.pb.go +++ b/api/execution/execution.pb.go @@ -145,7 +145,7 @@ func (*ListContainersResponse) ProtoMessage() {} func (*ListContainersResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{5} } type StartProcessRequest struct { - ContainerId string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` + ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` Process *Process `protobuf:"bytes,2,opt,name=process" json:"process,omitempty"` Console bool `protobuf:"varint,3,opt,name=console,proto3" json:"console,omitempty"` Stdin string `protobuf:"bytes,4,opt,name=stdin,proto3" json:"stdin,omitempty"` @@ -217,8 +217,8 @@ func (*GetContainerResponse) ProtoMessage() {} func (*GetContainerResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{12} } type UpdateContainerRequest struct { - Container *Container `protobuf:"bytes,1,opt,name=container" json:"container,omitempty"` - BundlePath string `protobuf:"bytes,2,opt,name=bundle_path,json=bundlePath,proto3" json:"bundle_path,omitempty"` + ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` + BundlePath string `protobuf:"bytes,2,opt,name=bundle_path,json=bundlePath,proto3" json:"bundle_path,omitempty"` } func (m *UpdateContainerRequest) Reset() { *m = UpdateContainerRequest{} } @@ -242,8 +242,8 @@ func (*ResumeContainerRequest) ProtoMessage() {} func (*ResumeContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{15} } type GetProcessRequest struct { - Container *Container `protobuf:"bytes,1,opt,name=container" json:"container,omitempty"` - ProcessId string `protobuf:"bytes,2,opt,name=process_id,json=processId,proto3" json:"process_id,omitempty"` + ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` + ProcessID string `protobuf:"bytes,2,opt,name=process_id,json=processId,proto3" json:"process_id,omitempty"` } func (m *GetProcessRequest) Reset() { *m = GetProcessRequest{} } @@ -259,9 +259,9 @@ func (*GetProcessResponse) ProtoMessage() {} func (*GetProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{17} } type SignalProcessRequest struct { - Container *Container `protobuf:"bytes,1,opt,name=container" json:"container,omitempty"` - Process *Process `protobuf:"bytes,2,opt,name=process" json:"process,omitempty"` - Signal uint32 `protobuf:"varint,3,opt,name=signal,proto3" json:"signal,omitempty"` + ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` + ProcessID string `protobuf:"bytes,2,opt,name=process_id,json=processId,proto3" json:"process_id,omitempty"` + Signal uint32 `protobuf:"varint,3,opt,name=signal,proto3" json:"signal,omitempty"` } func (m *SignalProcessRequest) Reset() { *m = SignalProcessRequest{} } @@ -269,8 +269,8 @@ func (*SignalProcessRequest) ProtoMessage() {} func (*SignalProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{18} } type DeleteProcessRequest struct { - Container *Container `protobuf:"bytes,1,opt,name=container" json:"container,omitempty"` - Process *Process `protobuf:"bytes,2,opt,name=process" json:"process,omitempty"` + ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` + ProcessID string `protobuf:"bytes,2,opt,name=process_id,json=processId,proto3" json:"process_id,omitempty"` } func (m *DeleteProcessRequest) Reset() { *m = DeleteProcessRequest{} } @@ -278,7 +278,7 @@ func (*DeleteProcessRequest) ProtoMessage() {} func (*DeleteProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{19} } type ListProcessesRequest struct { - Container *Container `protobuf:"bytes,1,opt,name=container" json:"container,omitempty"` + ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } func (m *ListProcessesRequest) Reset() { *m = ListProcessesRequest{} } @@ -393,7 +393,7 @@ func (this *StartProcessRequest) GoString() string { } s := make([]string, 0, 10) s = append(s, "&execution.StartProcessRequest{") - s = append(s, "ContainerId: "+fmt.Sprintf("%#v", this.ContainerId)+",\n") + s = append(s, "ContainerID: "+fmt.Sprintf("%#v", this.ContainerID)+",\n") if this.Process != nil { s = append(s, "Process: "+fmt.Sprintf("%#v", this.Process)+",\n") } @@ -487,9 +487,7 @@ func (this *UpdateContainerRequest) GoString() string { } s := make([]string, 0, 6) s = append(s, "&execution.UpdateContainerRequest{") - if this.Container != nil { - s = append(s, "Container: "+fmt.Sprintf("%#v", this.Container)+",\n") - } + s = append(s, "ContainerID: "+fmt.Sprintf("%#v", this.ContainerID)+",\n") s = append(s, "BundlePath: "+fmt.Sprintf("%#v", this.BundlePath)+",\n") s = append(s, "}") return strings.Join(s, "") @@ -520,10 +518,8 @@ func (this *GetProcessRequest) GoString() string { } s := make([]string, 0, 6) s = append(s, "&execution.GetProcessRequest{") - if this.Container != nil { - s = append(s, "Container: "+fmt.Sprintf("%#v", this.Container)+",\n") - } - s = append(s, "ProcessId: "+fmt.Sprintf("%#v", this.ProcessId)+",\n") + s = append(s, "ContainerID: "+fmt.Sprintf("%#v", this.ContainerID)+",\n") + s = append(s, "ProcessID: "+fmt.Sprintf("%#v", this.ProcessID)+",\n") s = append(s, "}") return strings.Join(s, "") } @@ -545,12 +541,8 @@ func (this *SignalProcessRequest) GoString() string { } s := make([]string, 0, 7) s = append(s, "&execution.SignalProcessRequest{") - if this.Container != nil { - s = append(s, "Container: "+fmt.Sprintf("%#v", this.Container)+",\n") - } - if this.Process != nil { - s = append(s, "Process: "+fmt.Sprintf("%#v", this.Process)+",\n") - } + s = append(s, "ContainerID: "+fmt.Sprintf("%#v", this.ContainerID)+",\n") + s = append(s, "ProcessID: "+fmt.Sprintf("%#v", this.ProcessID)+",\n") s = append(s, "Signal: "+fmt.Sprintf("%#v", this.Signal)+",\n") s = append(s, "}") return strings.Join(s, "") @@ -561,12 +553,8 @@ func (this *DeleteProcessRequest) GoString() string { } s := make([]string, 0, 6) s = append(s, "&execution.DeleteProcessRequest{") - if this.Container != nil { - s = append(s, "Container: "+fmt.Sprintf("%#v", this.Container)+",\n") - } - if this.Process != nil { - s = append(s, "Process: "+fmt.Sprintf("%#v", this.Process)+",\n") - } + s = append(s, "ContainerID: "+fmt.Sprintf("%#v", this.ContainerID)+",\n") + s = append(s, "ProcessID: "+fmt.Sprintf("%#v", this.ProcessID)+",\n") s = append(s, "}") return strings.Join(s, "") } @@ -576,9 +564,7 @@ func (this *ListProcessesRequest) GoString() string { } s := make([]string, 0, 5) s = append(s, "&execution.ListProcessesRequest{") - if this.Container != nil { - s = append(s, "Container: "+fmt.Sprintf("%#v", this.Container)+",\n") - } + s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "}") return strings.Join(s, "") } @@ -1301,11 +1287,11 @@ func (m *StartProcessRequest) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.ContainerId) > 0 { + if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerId))) - i += copy(dAtA[i:], m.ContainerId) + i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i += copy(dAtA[i:], m.ContainerID) } if m.Process != nil { dAtA[i] = 0x12 @@ -1613,15 +1599,11 @@ func (m *UpdateContainerRequest) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Container != nil { + if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Container.Size())) - n8, err := m.Container.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n8 + i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i += copy(dAtA[i:], m.ContainerID) } if len(m.BundlePath) > 0 { dAtA[i] = 0x12 @@ -1695,21 +1677,17 @@ func (m *GetProcessRequest) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Container != nil { + if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Container.Size())) - n9, err := m.Container.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n9 + i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i += copy(dAtA[i:], m.ContainerID) } - if len(m.ProcessId) > 0 { + if len(m.ProcessID) > 0 { dAtA[i] = 0x12 i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ProcessId))) - i += copy(dAtA[i:], m.ProcessId) + i = encodeVarintExecution(dAtA, i, uint64(len(m.ProcessID))) + i += copy(dAtA[i:], m.ProcessID) } return i, nil } @@ -1733,11 +1711,11 @@ func (m *GetProcessResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintExecution(dAtA, i, uint64(m.Process.Size())) - n10, err := m.Process.MarshalTo(dAtA[i:]) + n8, err := m.Process.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n10 + i += n8 } return i, nil } @@ -1757,25 +1735,17 @@ func (m *SignalProcessRequest) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Container != nil { + if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Container.Size())) - n11, err := m.Container.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n11 + i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i += copy(dAtA[i:], m.ContainerID) } - if m.Process != nil { + if len(m.ProcessID) > 0 { dAtA[i] = 0x12 i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Process.Size())) - n12, err := m.Process.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n12 + i = encodeVarintExecution(dAtA, i, uint64(len(m.ProcessID))) + i += copy(dAtA[i:], m.ProcessID) } if m.Signal != 0 { dAtA[i] = 0x18 @@ -1800,25 +1770,17 @@ func (m *DeleteProcessRequest) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Container != nil { + if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Container.Size())) - n13, err := m.Container.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n13 + i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i += copy(dAtA[i:], m.ContainerID) } - if m.Process != nil { + if len(m.ProcessID) > 0 { dAtA[i] = 0x12 i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Process.Size())) - n14, err := m.Process.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n14 + i = encodeVarintExecution(dAtA, i, uint64(len(m.ProcessID))) + i += copy(dAtA[i:], m.ProcessID) } return i, nil } @@ -1838,15 +1800,11 @@ func (m *ListProcessesRequest) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Container != nil { + if len(m.ID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Container.Size())) - n15, err := m.Container.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n15 + i = encodeVarintExecution(dAtA, i, uint64(len(m.ID))) + i += copy(dAtA[i:], m.ID) } return i, nil } @@ -1994,7 +1952,7 @@ func (m *ListContainersResponse) Size() (n int) { func (m *StartProcessRequest) Size() (n int) { var l int _ = l - l = len(m.ContainerId) + l = len(m.ContainerID) if l > 0 { n += 1 + l + sovExecution(uint64(l)) } @@ -2128,8 +2086,8 @@ func (m *GetContainerResponse) Size() (n int) { func (m *UpdateContainerRequest) Size() (n int) { var l int _ = l - if m.Container != nil { - l = m.Container.Size() + l = len(m.ContainerID) + if l > 0 { n += 1 + l + sovExecution(uint64(l)) } l = len(m.BundlePath) @@ -2162,11 +2120,11 @@ func (m *ResumeContainerRequest) Size() (n int) { func (m *GetProcessRequest) Size() (n int) { var l int _ = l - if m.Container != nil { - l = m.Container.Size() + l = len(m.ContainerID) + if l > 0 { n += 1 + l + sovExecution(uint64(l)) } - l = len(m.ProcessId) + l = len(m.ProcessID) if l > 0 { n += 1 + l + sovExecution(uint64(l)) } @@ -2186,12 +2144,12 @@ func (m *GetProcessResponse) Size() (n int) { func (m *SignalProcessRequest) Size() (n int) { var l int _ = l - if m.Container != nil { - l = m.Container.Size() + l = len(m.ContainerID) + if l > 0 { n += 1 + l + sovExecution(uint64(l)) } - if m.Process != nil { - l = m.Process.Size() + l = len(m.ProcessID) + if l > 0 { n += 1 + l + sovExecution(uint64(l)) } if m.Signal != 0 { @@ -2203,12 +2161,12 @@ func (m *SignalProcessRequest) Size() (n int) { func (m *DeleteProcessRequest) Size() (n int) { var l int _ = l - if m.Container != nil { - l = m.Container.Size() + l = len(m.ContainerID) + if l > 0 { n += 1 + l + sovExecution(uint64(l)) } - if m.Process != nil { - l = m.Process.Size() + l = len(m.ProcessID) + if l > 0 { n += 1 + l + sovExecution(uint64(l)) } return n @@ -2217,8 +2175,8 @@ func (m *DeleteProcessRequest) Size() (n int) { func (m *ListProcessesRequest) Size() (n int) { var l int _ = l - if m.Container != nil { - l = m.Container.Size() + l = len(m.ID) + if l > 0 { n += 1 + l + sovExecution(uint64(l)) } return n @@ -2319,7 +2277,7 @@ func (this *StartProcessRequest) String() string { return "nil" } s := strings.Join([]string{`&StartProcessRequest{`, - `ContainerId:` + fmt.Sprintf("%v", this.ContainerId) + `,`, + `ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`, `Process:` + strings.Replace(fmt.Sprintf("%v", this.Process), "Process", "Process", 1) + `,`, `Console:` + fmt.Sprintf("%v", this.Console) + `,`, `Stdin:` + fmt.Sprintf("%v", this.Stdin) + `,`, @@ -2405,7 +2363,7 @@ func (this *UpdateContainerRequest) String() string { return "nil" } s := strings.Join([]string{`&UpdateContainerRequest{`, - `Container:` + strings.Replace(fmt.Sprintf("%v", this.Container), "Container", "Container", 1) + `,`, + `ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`, `BundlePath:` + fmt.Sprintf("%v", this.BundlePath) + `,`, `}`, }, "") @@ -2436,8 +2394,8 @@ func (this *GetProcessRequest) String() string { return "nil" } s := strings.Join([]string{`&GetProcessRequest{`, - `Container:` + strings.Replace(fmt.Sprintf("%v", this.Container), "Container", "Container", 1) + `,`, - `ProcessId:` + fmt.Sprintf("%v", this.ProcessId) + `,`, + `ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`, + `ProcessID:` + fmt.Sprintf("%v", this.ProcessID) + `,`, `}`, }, "") return s @@ -2457,8 +2415,8 @@ func (this *SignalProcessRequest) String() string { return "nil" } s := strings.Join([]string{`&SignalProcessRequest{`, - `Container:` + strings.Replace(fmt.Sprintf("%v", this.Container), "Container", "Container", 1) + `,`, - `Process:` + strings.Replace(fmt.Sprintf("%v", this.Process), "Process", "Process", 1) + `,`, + `ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`, + `ProcessID:` + fmt.Sprintf("%v", this.ProcessID) + `,`, `Signal:` + fmt.Sprintf("%v", this.Signal) + `,`, `}`, }, "") @@ -2469,8 +2427,8 @@ func (this *DeleteProcessRequest) String() string { return "nil" } s := strings.Join([]string{`&DeleteProcessRequest{`, - `Container:` + strings.Replace(fmt.Sprintf("%v", this.Container), "Container", "Container", 1) + `,`, - `Process:` + strings.Replace(fmt.Sprintf("%v", this.Process), "Process", "Process", 1) + `,`, + `ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`, + `ProcessID:` + fmt.Sprintf("%v", this.ProcessID) + `,`, `}`, }, "") return s @@ -2480,7 +2438,7 @@ func (this *ListProcessesRequest) String() string { return "nil" } s := strings.Join([]string{`&ListProcessesRequest{`, - `Container:` + strings.Replace(fmt.Sprintf("%v", this.Container), "Container", "Container", 1) + `,`, + `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `}`, }, "") return s @@ -3150,7 +3108,7 @@ func (m *StartProcessRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ContainerId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ContainerID", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3175,7 +3133,7 @@ func (m *StartProcessRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ContainerId = string(dAtA[iNdEx:postIndex]) + m.ContainerID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -4148,9 +4106,9 @@ func (m *UpdateContainerRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Container", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ContainerID", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowExecution @@ -4160,24 +4118,20 @@ func (m *UpdateContainerRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + stringLen |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthExecution } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex > l { return io.ErrUnexpectedEOF } - if m.Container == nil { - m.Container = &Container{} - } - if err := m.Container.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.ContainerID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -4418,40 +4372,7 @@ func (m *GetProcessRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Container", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowExecution - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthExecution - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Container == nil { - m.Container = &Container{} - } - if err := m.Container.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProcessId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ContainerID", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -4476,7 +4397,36 @@ func (m *GetProcessRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ProcessId = string(dAtA[iNdEx:postIndex]) + m.ContainerID = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProcessID", 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.ProcessID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -4613,9 +4563,9 @@ func (m *SignalProcessRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Container", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ContainerID", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowExecution @@ -4625,30 +4575,26 @@ func (m *SignalProcessRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + stringLen |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthExecution } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex > l { return io.ErrUnexpectedEOF } - if m.Container == nil { - m.Container = &Container{} - } - if err := m.Container.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.ContainerID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Process", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ProcessID", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowExecution @@ -4658,24 +4604,20 @@ func (m *SignalProcessRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + stringLen |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthExecution } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex > l { return io.ErrUnexpectedEOF } - if m.Process == nil { - m.Process = &Process{} - } - if err := m.Process.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.ProcessID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 0 { @@ -4748,9 +4690,9 @@ func (m *DeleteProcessRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Container", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ContainerID", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowExecution @@ -4760,30 +4702,26 @@ func (m *DeleteProcessRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + stringLen |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthExecution } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex > l { return io.ErrUnexpectedEOF } - if m.Container == nil { - m.Container = &Container{} - } - if err := m.Container.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.ContainerID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Process", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ProcessID", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowExecution @@ -4793,24 +4731,20 @@ func (m *DeleteProcessRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + stringLen |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthExecution } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex > l { return io.ErrUnexpectedEOF } - if m.Process == nil { - m.Process = &Process{} - } - if err := m.Process.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.ProcessID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -4864,9 +4798,9 @@ func (m *ListProcessesRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Container", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowExecution @@ -4876,24 +4810,20 @@ func (m *ListProcessesRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + stringLen |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthExecution } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex > l { return io.ErrUnexpectedEOF } - if m.Container == nil { - m.Container = &Container{} - } - if err := m.Container.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.ID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -5105,67 +5035,67 @@ var ( func init() { proto.RegisterFile("execution.proto", fileDescriptorExecution) } var fileDescriptorExecution = []byte{ - // 980 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xc4, 0x56, 0xdd, 0x6e, 0x1b, 0x45, - 0x14, 0xce, 0xfa, 0x37, 0x3e, 0xee, 0x16, 0x33, 0x71, 0x96, 0x95, 0x01, 0x37, 0x5d, 0xda, 0x12, - 0x21, 0xc5, 0x09, 0x06, 0x21, 0x24, 0xae, 0xda, 0xd8, 0x98, 0x48, 0xc1, 0xb8, 0xe3, 0x5a, 0x95, - 0xb8, 0x89, 0x36, 0xde, 0xc1, 0x5d, 0xe4, 0xec, 0xba, 0x3b, 0xb3, 0x69, 0xb9, 0xeb, 0x63, 0x70, - 0xc3, 0x43, 0xf0, 0x16, 0x15, 0x57, 0x70, 0xc7, 0x15, 0x22, 0x7e, 0x02, 0x1e, 0x01, 0xcd, 0xcf, - 0xfa, 0x67, 0x77, 0xed, 0x98, 0x14, 0xc4, 0xdd, 0xcc, 0xd9, 0xef, 0x9c, 0xf9, 0xce, 0x39, 0xb3, - 0xdf, 0x1c, 0x78, 0x8b, 0xbc, 0x24, 0xc3, 0x90, 0xb9, 0xbe, 0xd7, 0x98, 0x04, 0x3e, 0xf3, 0x91, - 0x3e, 0xf4, 0x3d, 0x66, 0xbb, 0x1e, 0x09, 0x9c, 0xc6, 0xe5, 0xc7, 0xb5, 0x77, 0x47, 0xbe, 0x3f, - 0x1a, 0x93, 0x43, 0xf1, 0xf1, 0x3c, 0xfc, 0xee, 0x90, 0x5c, 0x4c, 0xd8, 0x0f, 0x12, 0x5b, 0xab, - 0x8e, 0xfc, 0x91, 0x2f, 0x96, 0x87, 0x7c, 0x25, 0xad, 0xd6, 0x21, 0xec, 0xf6, 0x99, 0x1d, 0xb0, - 0xe3, 0x28, 0x10, 0x26, 0xcf, 0x43, 0x42, 0x19, 0x32, 0x20, 0xe3, 0x3a, 0xa6, 0xb6, 0xa7, 0xed, - 0x97, 0x1e, 0x15, 0xa6, 0x7f, 0xdc, 0xc9, 0x9c, 0xb4, 0x70, 0xc6, 0x75, 0xac, 0x9f, 0x35, 0x30, - 0x8e, 0x03, 0x62, 0x33, 0xb2, 0xa9, 0x0b, 0xba, 0x03, 0xe5, 0xf3, 0xd0, 0x73, 0xc6, 0xe4, 0x6c, - 0x62, 0xb3, 0x67, 0x66, 0x86, 0x03, 0x30, 0x48, 0x53, 0xcf, 0x66, 0xcf, 0x90, 0x09, 0xc5, 0xa1, - 0xef, 0x51, 0x7f, 0x4c, 0xcc, 0xec, 0x9e, 0xb6, 0xbf, 0x8d, 0xa3, 0x2d, 0xaa, 0x42, 0x9e, 0x32, - 0xc7, 0xf5, 0xcc, 0x9c, 0x70, 0x92, 0x1b, 0x64, 0x40, 0x81, 0x32, 0xc7, 0x0f, 0x99, 0x99, 0x17, - 0x66, 0xb5, 0x53, 0x76, 0x12, 0x04, 0x66, 0x61, 0x66, 0x27, 0x41, 0x60, 0x3d, 0x86, 0x77, 0x12, - 0x94, 0xe9, 0xc4, 0xf7, 0x28, 0x41, 0x9f, 0x41, 0x69, 0x56, 0x43, 0x41, 0xbd, 0xdc, 0x34, 0x1b, - 0x4b, 0x55, 0x6d, 0xcc, 0x9d, 0xe6, 0x50, 0xeb, 0x08, 0x8c, 0x16, 0x19, 0x93, 0xcd, 0xab, 0x60, - 0x1d, 0xc0, 0xee, 0xa9, 0x4b, 0xe7, 0x85, 0xa6, 0x91, 0x43, 0x15, 0xf2, 0xfe, 0x0b, 0x79, 0x7c, - 0x96, 0xe7, 0x28, 0x36, 0x16, 0x06, 0x23, 0x0e, 0x57, 0x94, 0x3f, 0x07, 0x98, 0xf1, 0xa0, 0xc2, - 0x69, 0x1d, 0xe7, 0x05, 0xac, 0xf5, 0x8b, 0x06, 0x3b, 0xa2, 0xdb, 0xbd, 0xc0, 0x1f, 0x12, 0x3a, - 0x63, 0x70, 0x17, 0x6e, 0xcd, 0x50, 0x67, 0x11, 0x79, 0x5c, 0x9e, 0xd9, 0x4e, 0x1c, 0x74, 0x04, - 0xc5, 0x89, 0x74, 0x12, 0xfd, 0x2b, 0x37, 0x8d, 0xd8, 0x89, 0x51, 0xc8, 0x08, 0xf6, 0x9f, 0x37, - 0xf5, 0x2b, 0xa8, 0x2e, 0xe7, 0xa2, 0xca, 0xb3, 0xc0, 0x54, 0xdb, 0x88, 0xa9, 0x45, 0xa1, 0x34, - 0xab, 0xd7, 0xcd, 0x2f, 0xf1, 0x01, 0xe7, 0x69, 0xb3, 0x90, 0x8a, 0xb4, 0x6e, 0x37, 0x77, 0x63, - 0xc7, 0xf6, 0xc5, 0x47, 0xac, 0x40, 0xd6, 0x6f, 0x1a, 0x14, 0x15, 0x93, 0x95, 0x67, 0x56, 0x20, - 0x3b, 0x71, 0x1d, 0x71, 0x56, 0x16, 0xf3, 0x25, 0x42, 0x90, 0xb3, 0x83, 0x11, 0x35, 0xb3, 0xe2, - 0xaa, 0x88, 0x35, 0x47, 0x11, 0xef, 0xd2, 0xcc, 0x09, 0x13, 0x5f, 0xa2, 0x0f, 0x21, 0x17, 0x52, - 0x12, 0x88, 0x42, 0x96, 0x9b, 0x3b, 0x31, 0x22, 0x03, 0x4a, 0x02, 0x2c, 0x00, 0xdc, 0x75, 0xf8, - 0xc2, 0x51, 0x85, 0xe5, 0x4b, 0x54, 0x83, 0x6d, 0x46, 0x82, 0x0b, 0xd7, 0xb3, 0xc7, 0x66, 0x51, - 0xb4, 0x6d, 0xb6, 0xe7, 0x25, 0x20, 0x2f, 0x5d, 0x76, 0xa6, 0xd2, 0xdc, 0xde, 0xd3, 0xf6, 0x75, - 0x0c, 0xdc, 0x24, 0x73, 0xb3, 0x30, 0xe4, 0x06, 0x2a, 0x6c, 0xa8, 0x12, 0xd2, 0x31, 0x5f, 0x72, - 0xcb, 0x48, 0x65, 0xa2, 0x63, 0xbe, 0x44, 0x0f, 0xe0, 0xb6, 0xed, 0x38, 0x2e, 0x17, 0x33, 0x7b, - 0xdc, 0x71, 0x1d, 0x99, 0x93, 0x8e, 0x63, 0x56, 0xeb, 0x00, 0x76, 0x3a, 0x64, 0x73, 0x79, 0xea, - 0x42, 0x75, 0x19, 0xfe, 0x86, 0xff, 0xf9, 0x73, 0x30, 0x06, 0x13, 0x27, 0x4d, 0xed, 0x6e, 0x18, - 0xf1, 0xda, 0x8b, 0xc4, 0x25, 0xb9, 0x67, 0x87, 0x74, 0x73, 0x65, 0x39, 0x02, 0x03, 0x13, 0x1a, - 0x5e, 0x6c, 0xee, 0xf1, 0x3d, 0xbc, 0xdd, 0x21, 0x71, 0x15, 0xb8, 0x69, 0x42, 0xef, 0x03, 0xa8, - 0x3f, 0xe9, 0x4c, 0xb5, 0xb8, 0x84, 0x4b, 0xca, 0x72, 0xe2, 0x58, 0x5f, 0x02, 0x5a, 0x3c, 0xeb, - 0xc6, 0x7f, 0xe9, 0x8f, 0x1a, 0x54, 0xfb, 0xee, 0xc8, 0xb3, 0xc7, 0xff, 0x12, 0xef, 0x7f, 0x2e, - 0x69, 0x5c, 0x8a, 0x04, 0x03, 0xa1, 0x68, 0x3a, 0x56, 0x3b, 0xeb, 0x95, 0x06, 0x55, 0xf9, 0x1a, - 0xfc, 0x5f, 0xd4, 0xf8, 0xbd, 0xe7, 0xcf, 0x85, 0xb2, 0x93, 0x37, 0x65, 0x60, 0x7d, 0x2d, 0x5f, - 0xab, 0x85, 0x78, 0xaa, 0x71, 0x9f, 0x42, 0xd4, 0x5b, 0x12, 0x3d, 0x3e, 0xab, 0xc8, 0xcd, 0x81, - 0x1f, 0x7d, 0x01, 0x05, 0xa9, 0x11, 0xa8, 0x0c, 0xc5, 0x63, 0xdc, 0x7e, 0xf8, 0xa4, 0xdd, 0xaa, - 0x6c, 0xf1, 0x0d, 0x1e, 0x74, 0xbb, 0x27, 0xdd, 0x4e, 0x45, 0xe3, 0x9b, 0xfe, 0x93, 0x6f, 0x7a, - 0xbd, 0x76, 0xab, 0x92, 0x41, 0x00, 0x85, 0xde, 0xc3, 0x41, 0xbf, 0xdd, 0xaa, 0x64, 0x9b, 0x3f, - 0x6d, 0x43, 0xa5, 0x1d, 0x4d, 0x3e, 0x7d, 0x12, 0x5c, 0xba, 0x43, 0x82, 0x9e, 0x42, 0x41, 0xbe, - 0xe9, 0xe8, 0x7e, 0x3c, 0x9f, 0xd4, 0xe9, 0xa4, 0xf6, 0xe0, 0x3a, 0x98, 0x4a, 0xb0, 0x0d, 0x79, - 0xf1, 0xae, 0xa0, 0x7b, 0x49, 0x01, 0x4f, 0xce, 0x49, 0x35, 0xa3, 0x21, 0x87, 0xae, 0x46, 0x34, - 0x74, 0x35, 0xda, 0x7c, 0xe8, 0x42, 0x1d, 0x28, 0x48, 0xe1, 0x48, 0xf0, 0x4b, 0xd7, 0x93, 0x95, - 0x81, 0xda, 0x90, 0x17, 0x72, 0x90, 0xe0, 0x93, 0x2a, 0x12, 0xeb, 0xf8, 0x48, 0x91, 0x48, 0xf0, - 0x49, 0xd7, 0x8e, 0x75, 0x81, 0xe4, 0x5d, 0x4f, 0x04, 0x4a, 0x1f, 0x88, 0x56, 0x06, 0xea, 0x42, - 0xb6, 0x43, 0x18, 0xb2, 0x62, 0x51, 0x52, 0xd4, 0xbe, 0xf6, 0xc1, 0x5a, 0x8c, 0x6a, 0x5c, 0x1f, - 0x72, 0xfc, 0xca, 0x26, 0xea, 0x94, 0x3a, 0x75, 0xd5, 0xee, 0x5f, 0x83, 0x52, 0x41, 0x9f, 0xc2, - 0xad, 0xc5, 0x29, 0x23, 0xc1, 0x36, 0x65, 0x9c, 0x4a, 0xb0, 0x4d, 0x1d, 0x53, 0x1e, 0x03, 0xcc, - 0x65, 0x11, 0xed, 0x25, 0x13, 0x8c, 0x05, 0xbd, 0xbb, 0x06, 0xa1, 0x42, 0x9e, 0x82, 0xbe, 0x24, - 0x90, 0x28, 0x41, 0x24, 0x45, 0x3e, 0x57, 0xb6, 0xe7, 0x14, 0xf4, 0x25, 0x4d, 0x4b, 0x44, 0x4b, - 0x53, 0xbc, 0x95, 0xd1, 0xbe, 0x05, 0x7d, 0x49, 0x4f, 0x12, 0xd1, 0xd2, 0xd4, 0xab, 0x76, 0x6f, - 0x3d, 0x48, 0xe6, 0xfd, 0xe8, 0xbd, 0xd7, 0x57, 0xf5, 0xad, 0xdf, 0xaf, 0xea, 0x5b, 0x7f, 0x5d, - 0xd5, 0xb5, 0x57, 0xd3, 0xba, 0xf6, 0x7a, 0x5a, 0xd7, 0x7e, 0x9d, 0xd6, 0xb5, 0x3f, 0xa7, 0x75, - 0xed, 0xbc, 0x20, 0x98, 0x7c, 0xf2, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xeb, 0x07, 0xf1, 0x5d, - 0x3d, 0x0d, 0x00, 0x00, + // 992 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x56, 0xdd, 0x6e, 0xe3, 0x44, + 0x14, 0xae, 0xf3, 0xdb, 0x9c, 0xac, 0x77, 0xc3, 0x34, 0x35, 0x56, 0x40, 0x69, 0x31, 0xbb, 0x4b, + 0x85, 0x68, 0x5a, 0x02, 0x42, 0x48, 0x5c, 0x6d, 0x9b, 0x10, 0x22, 0x95, 0x90, 0x9d, 0x6c, 0xb4, + 0x12, 0x37, 0x95, 0x1b, 0x0f, 0x59, 0x4b, 0xa9, 0x1d, 0x3c, 0x76, 0xb7, 0xdc, 0xf1, 0x08, 0xbc, + 0x00, 0x0f, 0xc1, 0x5b, 0xec, 0x25, 0xdc, 0x21, 0x21, 0x55, 0x34, 0x4f, 0xc0, 0x23, 0xa0, 0xf9, + 0xb1, 0xf3, 0x63, 0xe7, 0x47, 0x85, 0xed, 0xdd, 0xcc, 0xf1, 0x37, 0x67, 0xbe, 0x73, 0x8e, 0xcf, + 0x37, 0x07, 0x1e, 0x91, 0x6b, 0x32, 0x08, 0x7c, 0xdb, 0x75, 0x6a, 0x63, 0xcf, 0xf5, 0x5d, 0xa4, + 0x0e, 0x5c, 0xc7, 0x37, 0x6d, 0x87, 0x78, 0x56, 0xed, 0xea, 0xd3, 0xca, 0x7b, 0x43, 0xd7, 0x1d, + 0x8e, 0xc8, 0x11, 0xff, 0x78, 0x11, 0xfc, 0x70, 0x44, 0x2e, 0xc7, 0xfe, 0x4f, 0x02, 0x5b, 0x29, + 0x0f, 0xdd, 0xa1, 0xcb, 0x97, 0x47, 0x6c, 0x25, 0xac, 0xc6, 0x11, 0xec, 0xf6, 0x7c, 0xd3, 0xf3, + 0x4f, 0x43, 0x47, 0x98, 0xfc, 0x18, 0x10, 0xea, 0x23, 0x0d, 0x52, 0xb6, 0xa5, 0x2b, 0xfb, 0xca, + 0x41, 0xe1, 0x24, 0x37, 0xb9, 0xd9, 0x4b, 0xb5, 0x1b, 0x38, 0x65, 0x5b, 0xc6, 0x6f, 0x0a, 0x68, + 0xa7, 0x1e, 0x31, 0x7d, 0xb2, 0xe9, 0x11, 0xb4, 0x07, 0xc5, 0x8b, 0xc0, 0xb1, 0x46, 0xe4, 0x7c, + 0x6c, 0xfa, 0xaf, 0xf4, 0x14, 0x03, 0x60, 0x10, 0xa6, 0xae, 0xe9, 0xbf, 0x42, 0x3a, 0xe4, 0x07, + 0xae, 0x43, 0xdd, 0x11, 0xd1, 0xd3, 0xfb, 0xca, 0xc1, 0x36, 0x0e, 0xb7, 0xa8, 0x0c, 0x59, 0xea, + 0x5b, 0xb6, 0xa3, 0x67, 0xf8, 0x21, 0xb1, 0x41, 0x1a, 0xe4, 0xa8, 0x6f, 0xb9, 0x81, 0xaf, 0x67, + 0xb9, 0x59, 0xee, 0xa4, 0x9d, 0x78, 0x9e, 0x9e, 0x8b, 0xec, 0xc4, 0xf3, 0x8c, 0xe7, 0xf0, 0x6e, + 0x8c, 0x32, 0x1d, 0xbb, 0x0e, 0x25, 0xe8, 0x0b, 0x28, 0x44, 0x39, 0xe4, 0xd4, 0x8b, 0x75, 0xbd, + 0x36, 0x97, 0xd5, 0xda, 0xf4, 0xd0, 0x14, 0x6a, 0x1c, 0x83, 0xd6, 0x20, 0x23, 0xb2, 0x79, 0x16, + 0x8c, 0x43, 0xd8, 0x3d, 0xb3, 0xe9, 0x34, 0xd1, 0x34, 0x3c, 0x50, 0x86, 0xac, 0xfb, 0x5a, 0x5c, + 0x9f, 0x66, 0x31, 0xf2, 0x8d, 0x81, 0x41, 0x5b, 0x84, 0x4b, 0xca, 0x5f, 0x02, 0x44, 0x3c, 0x28, + 0x3f, 0xb4, 0x8a, 0xf3, 0x0c, 0xd6, 0xf8, 0x4b, 0x81, 0x1d, 0x5e, 0xed, 0xae, 0xe7, 0x0e, 0x08, + 0x8d, 0x18, 0xd4, 0xe1, 0x41, 0x84, 0x3a, 0x8f, 0xc8, 0x3f, 0x9a, 0xdc, 0xec, 0x15, 0x23, 0x47, + 0xed, 0x06, 0x2e, 0x46, 0xa0, 0xb6, 0x85, 0x8e, 0x21, 0x3f, 0x16, 0x5e, 0x78, 0x41, 0x8b, 0x75, + 0x6d, 0x81, 0x42, 0x78, 0x47, 0x08, 0x7b, 0xeb, 0x55, 0xfe, 0x06, 0xca, 0xf3, 0xc1, 0xc9, 0x7c, + 0xcd, 0x30, 0x55, 0x36, 0x62, 0x6a, 0x50, 0x28, 0x44, 0x71, 0xdf, 0xfd, 0xaf, 0x3e, 0x64, 0x3c, + 0x4d, 0x3f, 0xa0, 0x3c, 0xac, 0x87, 0xf5, 0xdd, 0x85, 0x6b, 0x7b, 0xfc, 0x23, 0x96, 0x20, 0xe3, + 0x0f, 0x05, 0xf2, 0x92, 0xc9, 0xd2, 0x3b, 0x4b, 0x90, 0x1e, 0xdb, 0x16, 0xbf, 0x2b, 0x8d, 0xd9, + 0x12, 0x21, 0xc8, 0x98, 0xde, 0x90, 0xea, 0x69, 0xfe, 0xef, 0xf0, 0x35, 0x43, 0x11, 0xe7, 0x4a, + 0xcf, 0x70, 0x13, 0x5b, 0xa2, 0x8f, 0x20, 0x13, 0x50, 0xe2, 0xf1, 0x44, 0x16, 0xeb, 0x3b, 0x0b, + 0x44, 0xfa, 0x94, 0x78, 0x98, 0x03, 0xd8, 0xd1, 0xc1, 0x6b, 0x4b, 0x26, 0x96, 0x2d, 0x51, 0x05, + 0xb6, 0x7d, 0xe2, 0x5d, 0xda, 0x8e, 0x39, 0xd2, 0xf3, 0xbc, 0x6c, 0xd1, 0x9e, 0xa5, 0x80, 0x5c, + 0xdb, 0xfe, 0xb9, 0x0c, 0x73, 0x7b, 0x5f, 0x39, 0x50, 0x31, 0x30, 0x93, 0x88, 0xcd, 0xc0, 0x90, + 0xe9, 0x4b, 0xb7, 0x81, 0x0c, 0x48, 0xc5, 0x6c, 0xc9, 0x2c, 0x43, 0x19, 0x89, 0x8a, 0xd9, 0x12, + 0x3d, 0x85, 0x87, 0xa6, 0x65, 0xd9, 0x4c, 0xdd, 0xcc, 0x51, 0xcb, 0xb6, 0x44, 0x4c, 0x2a, 0x5e, + 0xb0, 0x1a, 0x87, 0xb0, 0xd3, 0x22, 0x9b, 0xeb, 0x55, 0x07, 0xca, 0xf3, 0xf0, 0xff, 0xd8, 0xf8, + 0x97, 0xa0, 0xf5, 0xc7, 0x56, 0x92, 0xfc, 0xdd, 0xa5, 0x8b, 0xd6, 0xfd, 0x44, 0x4c, 0x9f, 0xbb, + 0x66, 0x40, 0x37, 0x97, 0x99, 0x63, 0xd0, 0x30, 0xa1, 0xc1, 0xe5, 0xe6, 0x27, 0x02, 0x78, 0xa7, + 0x45, 0xfe, 0x0f, 0x49, 0xf8, 0x04, 0x40, 0x76, 0xd0, 0xb9, 0x2c, 0x6d, 0xe1, 0x44, 0x9d, 0xdc, + 0xec, 0x15, 0xa4, 0xef, 0x76, 0x03, 0x17, 0x24, 0xa0, 0x6d, 0x19, 0x5f, 0x03, 0x9a, 0xbd, 0xf6, + 0xce, 0xcd, 0xfa, 0x8b, 0x02, 0xe5, 0x9e, 0x3d, 0x74, 0xcc, 0xd1, 0x7d, 0x87, 0xc0, 0x95, 0x88, + 0xdf, 0xcc, 0x05, 0x4d, 0xc5, 0x72, 0x67, 0x5c, 0x43, 0x59, 0x3c, 0x0e, 0xf7, 0x9e, 0xd4, 0x1a, + 0x94, 0xd9, 0xab, 0x21, 0xbf, 0x11, 0xba, 0xae, 0xf6, 0xdf, 0x8a, 0x47, 0x69, 0x06, 0x2f, 0xeb, + 0xf0, 0x39, 0x84, 0x5e, 0x49, 0xf8, 0xc6, 0x2c, 0xab, 0xc4, 0x14, 0xf8, 0xf1, 0x57, 0x90, 0x13, + 0x9d, 0x8f, 0x8a, 0x90, 0x3f, 0xc5, 0xcd, 0x67, 0x2f, 0x9a, 0x8d, 0xd2, 0x16, 0xdb, 0xe0, 0x7e, + 0xa7, 0xd3, 0xee, 0xb4, 0x4a, 0x0a, 0xdb, 0xf4, 0x5e, 0x7c, 0xd7, 0xed, 0x36, 0x1b, 0xa5, 0x14, + 0x02, 0xc8, 0x75, 0x9f, 0xf5, 0x7b, 0xcd, 0x46, 0x29, 0x5d, 0xff, 0x75, 0x1b, 0x4a, 0xcd, 0x70, + 0xc0, 0xe9, 0x11, 0xef, 0xca, 0x1e, 0x10, 0xf4, 0x12, 0x72, 0xe2, 0xe9, 0x46, 0x4f, 0x16, 0xbb, + 0x33, 0x71, 0x08, 0xa9, 0x3c, 0x5d, 0x07, 0x93, 0x01, 0x36, 0x21, 0xcb, 0x5f, 0x0b, 0xf4, 0x38, + 0x2e, 0xcb, 0xf1, 0x71, 0xa8, 0xa2, 0xd5, 0xc4, 0x6c, 0x55, 0x0b, 0x67, 0xab, 0x5a, 0x93, 0xcd, + 0x56, 0xa8, 0x05, 0x39, 0x21, 0x07, 0x31, 0x7e, 0xc9, 0x2a, 0xb1, 0xd4, 0x51, 0x13, 0xb2, 0xbc, + 0xd1, 0x63, 0x7c, 0x12, 0xdb, 0x7f, 0x15, 0x1f, 0xd1, 0xfe, 0x31, 0x3e, 0xc9, 0xaa, 0xb0, 0xca, + 0x91, 0xf8, 0x87, 0x63, 0x8e, 0x92, 0xe7, 0x9e, 0xa5, 0x8e, 0x3a, 0x90, 0x6e, 0x11, 0x1f, 0x19, + 0x0b, 0x5e, 0x12, 0x34, 0xbc, 0xf2, 0xe1, 0x4a, 0x8c, 0x2c, 0x5c, 0x0f, 0x32, 0xec, 0x97, 0x8d, + 0xe5, 0x29, 0x71, 0xb8, 0xaa, 0x3c, 0x59, 0x83, 0x92, 0x4e, 0x5f, 0xc2, 0x83, 0xd9, 0xd9, 0x21, + 0xc6, 0x36, 0x61, 0x6a, 0x8a, 0xb1, 0x4d, 0x1c, 0x3e, 0x9e, 0x03, 0x4c, 0x55, 0x0e, 0xed, 0xc7, + 0x03, 0x5c, 0x70, 0xfa, 0xc1, 0x0a, 0x84, 0x74, 0x79, 0x06, 0xea, 0x9c, 0xde, 0xa1, 0x18, 0x91, + 0x04, 0x35, 0x5c, 0x5a, 0x9e, 0x33, 0x50, 0xe7, 0xb4, 0x2a, 0xe6, 0x2d, 0x49, 0xc9, 0x96, 0x7a, + 0xfb, 0x1e, 0xd4, 0x39, 0x3d, 0x89, 0x79, 0x4b, 0x52, 0xa7, 0xca, 0xe3, 0xd5, 0x20, 0x11, 0xf7, + 0xc9, 0xfb, 0x6f, 0x6e, 0xab, 0x5b, 0x7f, 0xde, 0x56, 0xb7, 0xfe, 0xb9, 0xad, 0x2a, 0x3f, 0x4f, + 0xaa, 0xca, 0x9b, 0x49, 0x55, 0xf9, 0x7d, 0x52, 0x55, 0xfe, 0x9e, 0x54, 0x95, 0x8b, 0x1c, 0x67, + 0xf2, 0xd9, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3e, 0xf2, 0x89, 0x40, 0x24, 0x0d, 0x00, 0x00, } diff --git a/api/execution/execution.proto b/api/execution/execution.proto index 2ee5e76..0196a83 100644 --- a/api/execution/execution.proto +++ b/api/execution/execution.proto @@ -53,7 +53,7 @@ message ListContainersResponse { } message StartProcessRequest { - string container_id = 1; + string container_id = 1 [(gogoproto.customname) = "ContainerID"]; Process process = 2; bool console = 3; string stdin = 4; @@ -104,7 +104,7 @@ message GetContainerResponse { } message UpdateContainerRequest { - Container container = 1; + string container_id = 1 [(gogoproto.customname) = "ContainerID"]; string bundle_path = 2; } @@ -117,8 +117,8 @@ message ResumeContainerRequest { } message GetProcessRequest { - Container container = 1; - string process_id = 2; + string container_id = 1 [(gogoproto.customname) = "ContainerID"]; + string process_id = 2 [(gogoproto.customname) = "ProcessID"]; } message GetProcessResponse { @@ -126,18 +126,18 @@ message GetProcessResponse { } message SignalProcessRequest { - Container container = 1; - Process process = 2; + string container_id = 1 [(gogoproto.customname) = "ContainerID"]; + string process_id = 2 [(gogoproto.customname) = "ProcessID"]; uint32 signal = 3; } message DeleteProcessRequest { - Container container = 1; - Process process = 2; + string container_id = 1 [(gogoproto.customname) = "ContainerID"]; + string process_id = 2 [(gogoproto.customname) = "ProcessID"]; } message ListProcessesRequest { - Container container = 1; + string id = 1 [(gogoproto.customname) = "ID"]; } message ListProcessesResponse { diff --git a/cmd/ctr/exec.go b/cmd/ctr/exec.go index 4675403..be694ac 100644 --- a/cmd/ctr/exec.go +++ b/cmd/ctr/exec.go @@ -46,7 +46,7 @@ var execCommand = cli.Command{ defer os.RemoveAll(tmpDir) sOpts := &execution.StartProcessRequest{ - ContainerId: id, + ContainerID: id, Process: &execution.Process{ Cwd: context.String("cwd"), Terminal: context.Bool("tty"), @@ -70,10 +70,8 @@ var execCommand = cli.Command{ } _, err = executionService.DeleteProcess(gocontext.Background(), &execution.DeleteProcessRequest{ - Container: &execution.Container{ - ID: id, - }, - Process: sr.Process, + ContainerID: id, + ProcessID: sr.Process.ID, }) if err != nil { return err diff --git a/execution/service.go b/execution/service.go index 3e1f6ef..e26426f 100644 --- a/execution/service.go +++ b/execution/service.go @@ -110,7 +110,7 @@ func (s *Service) Start(ctx context.Context, r *api.StartContainerRequest) (*goo } func (s *Service) StartProcess(ctx context.Context, r *api.StartProcessRequest) (*api.StartProcessResponse, error) { - container, err := s.executor.Load(ctx, r.ContainerId) + container, err := s.executor.Load(ctx, r.ContainerID) if err != nil { return nil, err } @@ -147,11 +147,11 @@ func (s *Service) StartProcess(ctx context.Context, r *api.StartProcessRequest) // containerd managed execs + system pids forked in container func (s *Service) GetProcess(ctx context.Context, r *api.GetProcessRequest) (*api.GetProcessResponse, error) { - container, err := s.executor.Load(ctx, r.Container.ID) + container, err := s.executor.Load(ctx, r.ContainerID) if err != nil { return nil, err } - process := container.GetProcess(r.ProcessId) + process := container.GetProcess(r.ProcessID) if process == nil { return nil, ErrProcessNotFound } @@ -161,11 +161,11 @@ func (s *Service) GetProcess(ctx context.Context, r *api.GetProcessRequest) (*ap } func (s *Service) SignalProcess(ctx context.Context, r *api.SignalProcessRequest) (*google_protobuf.Empty, error) { - container, err := s.executor.Load(ctx, r.Container.ID) + container, err := s.executor.Load(ctx, r.ContainerID) if err != nil { return emptyResponse, err } - process := container.GetProcess(r.Process.ID) + process := container.GetProcess(r.ProcessID) if process == nil { return nil, fmt.Errorf("Make me a constant! Process not foumd!") } @@ -173,18 +173,18 @@ func (s *Service) SignalProcess(ctx context.Context, r *api.SignalProcessRequest } func (s *Service) DeleteProcess(ctx context.Context, r *api.DeleteProcessRequest) (*google_protobuf.Empty, error) { - container, err := s.executor.Load(ctx, r.Container.ID) + container, err := s.executor.Load(ctx, r.ContainerID) if err != nil { return emptyResponse, err } - if err := s.executor.DeleteProcess(ctx, container, r.Process.ID); err != nil { + if err := s.executor.DeleteProcess(ctx, container, r.ProcessID); err != nil { return emptyResponse, err } return emptyResponse, nil } func (s *Service) ListProcesses(ctx context.Context, r *api.ListProcessesRequest) (*api.ListProcessesResponse, error) { - container, err := s.executor.Load(ctx, r.Container.ID) + container, err := s.executor.Load(ctx, r.ID) if err != nil { return nil, err }