From ef03000b27d80f1fd2c2116d4ad4845b214f6491 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Thu, 1 Dec 2016 14:25:03 -0800 Subject: [PATCH] Revert "proto: move all protos under a single root" This reverts commit 352c6b590ca951c7b3d22438bd3440a1aa6f79fd. --- Makefile | 8 +- api/{ => execution}/execution.pb.go | 963 ++++++++++++++-------------- api/{ => execution}/execution.proto | 0 api/execution/gen.go | 3 + api/registry/gen.go | 3 + api/{ => registry}/registry.pb.go | 90 +-- api/{ => registry}/registry.proto | 0 7 files changed, 531 insertions(+), 536 deletions(-) rename api/{ => execution}/execution.pb.go (80%) rename api/{ => execution}/execution.proto (100%) create mode 100644 api/execution/gen.go create mode 100644 api/registry/gen.go rename api/{ => registry}/registry.pb.go (93%) rename api/{ => registry}/registry.proto (100%) diff --git a/Makefile b/Makefile index 7e006ae..0487508 100644 --- a/Makefile +++ b/Makefile @@ -22,8 +22,6 @@ BINARIES=$(addprefix bin/,$(COMMANDS)) # time. GO_LDFLAGS=-ldflags "-X `go list`.Version=$(VERSION)" -PROTOS=$(shell cd api ; find -name '*.proto') - .PHONY: clean all AUTHORS fmt vet lint build binaries test integration setup generate checkprotos coverage ci check help install uninstall .DEFAULT: default @@ -48,10 +46,7 @@ setup: ## install dependencies generate: bin/protoc-gen-gogoctrd ## generate protobuf @echo "🐳 $@" - @for p in $(PROTOS) ; do \ - PATH=${ROOTDIR}/bin:${PATH} protoc -I.:../../../github.com/gogo/protobuf --gogoctrd_out=plugins=grpc,import_path=github.com/docker/containerd/api,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:. api/$$p ; \ - done - + @PATH=${ROOTDIR}/bin:${PATH} go generate -x ${PACKAGES} checkprotos: generate ## check if protobufs needs to be generated again @echo "🐳 $@" @@ -138,3 +133,4 @@ coverage-integration: ## generate coverprofiles from the integration tests help: ## this help @awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort + diff --git a/api/execution.pb.go b/api/execution/execution.pb.go similarity index 80% rename from api/execution.pb.go rename to api/execution/execution.pb.go index ba17b73..8419535 100644 --- a/api/execution.pb.go +++ b/api/execution/execution.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. -// source: api/execution.proto +// source: execution.proto // DO NOT EDIT! /* - Package api is a generated protocol buffer package. + Package execution is a generated protocol buffer package. It is generated from these files: - api/execution.proto + execution.proto It has these top-level messages: Container @@ -14,23 +14,23 @@ ProcessSpec Mount User - CreateContainerRequest - CreateContainerResponse - StartContainerRequest + CreateRequest + CreateResponse + StartRequest State - StartContainerResponse - DeleteContainerRequest - DeleteContainerResponse + StartResponse + DeleteRequest + DeleteResponse ContainerListRequest ContainerListResponse - StateContainerRequest - StateContainerResponse - UpdateContainerRequest - UpdateContainerResponse - PauseContainerRequest - PauseContainerResponse - ResumeContainerRequest - ResumeContainerResponse + StateRequest + StateResponse + UpdateRequest + UpdateResponse + PauseRequest + PauseResponse + ResumeRequest + ResumeResponse CreateProcessRequest CreateProcessResponse StartProcessRequest @@ -46,7 +46,7 @@ EventsRequest EventsResponse */ -package api +package execution import proto "github.com/gogo/protobuf/proto" import fmt "fmt" @@ -137,7 +137,7 @@ func (m *User) Reset() { *m = User{} } func (*User) ProtoMessage() {} func (*User) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{4} } -type CreateContainerRequest struct { +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"` @@ -145,25 +145,25 @@ type CreateContainerRequest struct { ConfigPath string `protobuf:"bytes,5,opt,name=config_path,json=configPath,proto3" json:"config_path,omitempty"` } -func (m *CreateContainerRequest) Reset() { *m = CreateContainerRequest{} } -func (*CreateContainerRequest) ProtoMessage() {} -func (*CreateContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{5} } +func (m *CreateRequest) Reset() { *m = CreateRequest{} } +func (*CreateRequest) ProtoMessage() {} +func (*CreateRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{5} } -type CreateContainerResponse struct { +type CreateResponse struct { Container *Container `protobuf:"bytes,1,opt,name=container" json:"container,omitempty"` } -func (m *CreateContainerResponse) Reset() { *m = CreateContainerResponse{} } -func (*CreateContainerResponse) ProtoMessage() {} -func (*CreateContainerResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{6} } +func (m *CreateResponse) Reset() { *m = CreateResponse{} } +func (*CreateResponse) ProtoMessage() {} +func (*CreateResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{6} } -type StartContainerRequest struct { +type StartRequest struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } -func (m *StartContainerRequest) Reset() { *m = StartContainerRequest{} } -func (*StartContainerRequest) ProtoMessage() {} -func (*StartContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{7} } +func (m *StartRequest) Reset() { *m = StartRequest{} } +func (*StartRequest) ProtoMessage() {} +func (*StartRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{7} } type State struct { } @@ -172,30 +172,28 @@ func (m *State) Reset() { *m = State{} } func (*State) ProtoMessage() {} func (*State) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{8} } -type StartContainerResponse struct { +type StartResponse struct { State *State `protobuf:"bytes,1,opt,name=state" json:"state,omitempty"` } -func (m *StartContainerResponse) Reset() { *m = StartContainerResponse{} } -func (*StartContainerResponse) ProtoMessage() {} -func (*StartContainerResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{9} } +func (m *StartResponse) Reset() { *m = StartResponse{} } +func (*StartResponse) ProtoMessage() {} +func (*StartResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{9} } -type DeleteContainerRequest struct { +type DeleteRequest struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } -func (m *DeleteContainerRequest) Reset() { *m = DeleteContainerRequest{} } -func (*DeleteContainerRequest) ProtoMessage() {} -func (*DeleteContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{10} } +func (m *DeleteRequest) Reset() { *m = DeleteRequest{} } +func (*DeleteRequest) ProtoMessage() {} +func (*DeleteRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{10} } -type DeleteContainerResponse struct { +type DeleteResponse struct { } -func (m *DeleteContainerResponse) Reset() { *m = DeleteContainerResponse{} } -func (*DeleteContainerResponse) ProtoMessage() {} -func (*DeleteContainerResponse) Descriptor() ([]byte, []int) { - return fileDescriptorExecution, []int{11} -} +func (m *DeleteResponse) Reset() { *m = DeleteResponse{} } +func (*DeleteResponse) ProtoMessage() {} +func (*DeleteResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{11} } type ContainerListRequest struct { Owner []string `protobuf:"bytes,1,rep,name=owner" json:"owner,omitempty"` @@ -213,70 +211,66 @@ func (m *ContainerListResponse) Reset() { *m = ContainerListR func (*ContainerListResponse) ProtoMessage() {} func (*ContainerListResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{13} } -type StateContainerRequest struct { +type StateRequest struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } -func (m *StateContainerRequest) Reset() { *m = StateContainerRequest{} } -func (*StateContainerRequest) ProtoMessage() {} -func (*StateContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{14} } +func (m *StateRequest) Reset() { *m = StateRequest{} } +func (*StateRequest) ProtoMessage() {} +func (*StateRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{14} } -type StateContainerResponse struct { +type StateResponse struct { Container *Container `protobuf:"bytes,1,opt,name=container" json:"container,omitempty"` } -func (m *StateContainerResponse) Reset() { *m = StateContainerResponse{} } -func (*StateContainerResponse) ProtoMessage() {} -func (*StateContainerResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{15} } +func (m *StateResponse) Reset() { *m = StateResponse{} } +func (*StateResponse) ProtoMessage() {} +func (*StateResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{15} } -type UpdateContainerRequest struct { +type UpdateRequest struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } -func (m *UpdateContainerRequest) Reset() { *m = UpdateContainerRequest{} } -func (*UpdateContainerRequest) ProtoMessage() {} -func (*UpdateContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{16} } +func (m *UpdateRequest) Reset() { *m = UpdateRequest{} } +func (*UpdateRequest) ProtoMessage() {} +func (*UpdateRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{16} } -type UpdateContainerResponse struct { +type UpdateResponse struct { } -func (m *UpdateContainerResponse) Reset() { *m = UpdateContainerResponse{} } -func (*UpdateContainerResponse) ProtoMessage() {} -func (*UpdateContainerResponse) Descriptor() ([]byte, []int) { - return fileDescriptorExecution, []int{17} -} +func (m *UpdateResponse) Reset() { *m = UpdateResponse{} } +func (*UpdateResponse) ProtoMessage() {} +func (*UpdateResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{17} } -type PauseContainerRequest struct { +type PauseRequest struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } -func (m *PauseContainerRequest) Reset() { *m = PauseContainerRequest{} } -func (*PauseContainerRequest) ProtoMessage() {} -func (*PauseContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{18} } +func (m *PauseRequest) Reset() { *m = PauseRequest{} } +func (*PauseRequest) ProtoMessage() {} +func (*PauseRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{18} } -type PauseContainerResponse struct { +type PauseResponse struct { } -func (m *PauseContainerResponse) Reset() { *m = PauseContainerResponse{} } -func (*PauseContainerResponse) ProtoMessage() {} -func (*PauseContainerResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{19} } +func (m *PauseResponse) Reset() { *m = PauseResponse{} } +func (*PauseResponse) ProtoMessage() {} +func (*PauseResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{19} } -type ResumeContainerRequest struct { +type ResumeRequest struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } -func (m *ResumeContainerRequest) Reset() { *m = ResumeContainerRequest{} } -func (*ResumeContainerRequest) ProtoMessage() {} -func (*ResumeContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{20} } +func (m *ResumeRequest) Reset() { *m = ResumeRequest{} } +func (*ResumeRequest) ProtoMessage() {} +func (*ResumeRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{20} } -type ResumeContainerResponse struct { +type ResumeResponse struct { } -func (m *ResumeContainerResponse) Reset() { *m = ResumeContainerResponse{} } -func (*ResumeContainerResponse) ProtoMessage() {} -func (*ResumeContainerResponse) Descriptor() ([]byte, []int) { - return fileDescriptorExecution, []int{21} -} +func (m *ResumeResponse) Reset() { *m = ResumeResponse{} } +func (*ResumeResponse) ProtoMessage() {} +func (*ResumeResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{21} } type CreateProcessRequest struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` @@ -396,23 +390,23 @@ func init() { proto.RegisterType((*ProcessSpec)(nil), "containerd.v1.ProcessSpec") proto.RegisterType((*Mount)(nil), "containerd.v1.Mount") proto.RegisterType((*User)(nil), "containerd.v1.User") - proto.RegisterType((*CreateContainerRequest)(nil), "containerd.v1.CreateContainerRequest") - proto.RegisterType((*CreateContainerResponse)(nil), "containerd.v1.CreateContainerResponse") - proto.RegisterType((*StartContainerRequest)(nil), "containerd.v1.StartContainerRequest") + proto.RegisterType((*CreateRequest)(nil), "containerd.v1.CreateRequest") + proto.RegisterType((*CreateResponse)(nil), "containerd.v1.CreateResponse") + proto.RegisterType((*StartRequest)(nil), "containerd.v1.StartRequest") proto.RegisterType((*State)(nil), "containerd.v1.State") - proto.RegisterType((*StartContainerResponse)(nil), "containerd.v1.StartContainerResponse") - proto.RegisterType((*DeleteContainerRequest)(nil), "containerd.v1.DeleteContainerRequest") - proto.RegisterType((*DeleteContainerResponse)(nil), "containerd.v1.DeleteContainerResponse") + proto.RegisterType((*StartResponse)(nil), "containerd.v1.StartResponse") + proto.RegisterType((*DeleteRequest)(nil), "containerd.v1.DeleteRequest") + proto.RegisterType((*DeleteResponse)(nil), "containerd.v1.DeleteResponse") proto.RegisterType((*ContainerListRequest)(nil), "containerd.v1.ContainerListRequest") proto.RegisterType((*ContainerListResponse)(nil), "containerd.v1.ContainerListResponse") - 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((*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((*CreateProcessRequest)(nil), "containerd.v1.CreateProcessRequest") proto.RegisterType((*CreateProcessResponse)(nil), "containerd.v1.CreateProcessResponse") proto.RegisterType((*StartProcessRequest)(nil), "containerd.v1.StartProcessRequest") @@ -433,7 +427,7 @@ func (this *Container) GoString() string { return "nil" } s := make([]string, 0, 8) - s = append(s, "&api.Container{") + s = append(s, "&execution.Container{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") if this.Mounts != nil { s = append(s, "Mounts: "+fmt.Sprintf("%#v", this.Mounts)+",\n") @@ -450,7 +444,7 @@ func (this *Process) GoString() string { return "nil" } s := make([]string, 0, 10) - s = append(s, "&api.Process{") + s = append(s, "&execution.Process{") s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n") s = append(s, "Args: "+fmt.Sprintf("%#v", this.Args)+",\n") s = append(s, "Env: "+fmt.Sprintf("%#v", this.Env)+",\n") @@ -467,7 +461,7 @@ func (this *ProcessSpec) GoString() string { return "nil" } s := make([]string, 0, 12) - s = append(s, "&api.ProcessSpec{") + s = append(s, "&execution.ProcessSpec{") s = append(s, "Args: "+fmt.Sprintf("%#v", this.Args)+",\n") s = append(s, "Env: "+fmt.Sprintf("%#v", this.Env)+",\n") if this.User != nil { @@ -486,7 +480,7 @@ func (this *Mount) GoString() string { return "nil" } s := make([]string, 0, 8) - s = append(s, "&api.Mount{") + 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") @@ -499,19 +493,19 @@ func (this *User) GoString() string { return "nil" } s := make([]string, 0, 7) - s = append(s, "&api.User{") + s = append(s, "&execution.User{") s = append(s, "Uid: "+fmt.Sprintf("%#v", this.Uid)+",\n") s = append(s, "Gid: "+fmt.Sprintf("%#v", this.Gid)+",\n") s = append(s, "AdditionalGids: "+fmt.Sprintf("%#v", this.AdditionalGids)+",\n") s = append(s, "}") return strings.Join(s, "") } -func (this *CreateContainerRequest) GoString() string { +func (this *CreateRequest) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 9) - s = append(s, "&api.CreateContainerRequest{") + s = append(s, "&execution.CreateRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") if this.Process != nil { s = append(s, "Process: "+fmt.Sprintf("%#v", this.Process)+",\n") @@ -524,24 +518,24 @@ func (this *CreateContainerRequest) GoString() string { s = append(s, "}") return strings.Join(s, "") } -func (this *CreateContainerResponse) GoString() string { +func (this *CreateResponse) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&api.CreateContainerResponse{") + s = append(s, "&execution.CreateResponse{") if this.Container != nil { s = append(s, "Container: "+fmt.Sprintf("%#v", this.Container)+",\n") } s = append(s, "}") return strings.Join(s, "") } -func (this *StartContainerRequest) GoString() string { +func (this *StartRequest) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&api.StartContainerRequest{") + s = append(s, "&execution.StartRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "}") return strings.Join(s, "") @@ -551,38 +545,38 @@ func (this *State) GoString() string { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.State{") + s = append(s, "&execution.State{") s = append(s, "}") return strings.Join(s, "") } -func (this *StartContainerResponse) GoString() string { +func (this *StartResponse) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&api.StartContainerResponse{") + s = append(s, "&execution.StartResponse{") if this.State != nil { s = append(s, "State: "+fmt.Sprintf("%#v", this.State)+",\n") } s = append(s, "}") return strings.Join(s, "") } -func (this *DeleteContainerRequest) GoString() string { +func (this *DeleteRequest) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&api.DeleteContainerRequest{") + s = append(s, "&execution.DeleteRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "}") return strings.Join(s, "") } -func (this *DeleteContainerResponse) GoString() string { +func (this *DeleteResponse) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.DeleteContainerResponse{") + s = append(s, "&execution.DeleteResponse{") s = append(s, "}") return strings.Join(s, "") } @@ -591,7 +585,7 @@ func (this *ContainerListRequest) GoString() string { return "nil" } s := make([]string, 0, 5) - s = append(s, "&api.ContainerListRequest{") + s = append(s, "&execution.ContainerListRequest{") s = append(s, "Owner: "+fmt.Sprintf("%#v", this.Owner)+",\n") s = append(s, "}") return strings.Join(s, "") @@ -601,89 +595,89 @@ func (this *ContainerListResponse) GoString() string { return "nil" } s := make([]string, 0, 5) - s = append(s, "&api.ContainerListResponse{") + s = append(s, "&execution.ContainerListResponse{") if this.Containers != nil { s = append(s, "Containers: "+fmt.Sprintf("%#v", this.Containers)+",\n") } s = append(s, "}") return strings.Join(s, "") } -func (this *StateContainerRequest) GoString() string { +func (this *StateRequest) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&api.StateContainerRequest{") + s = append(s, "&execution.StateRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "}") return strings.Join(s, "") } -func (this *StateContainerResponse) GoString() string { +func (this *StateResponse) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&api.StateContainerResponse{") + s = append(s, "&execution.StateResponse{") if this.Container != nil { s = append(s, "Container: "+fmt.Sprintf("%#v", this.Container)+",\n") } s = append(s, "}") return strings.Join(s, "") } -func (this *UpdateContainerRequest) GoString() string { +func (this *UpdateRequest) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&api.UpdateContainerRequest{") + s = append(s, "&execution.UpdateRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "}") return strings.Join(s, "") } -func (this *UpdateContainerResponse) GoString() string { +func (this *UpdateResponse) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.UpdateContainerResponse{") + s = append(s, "&execution.UpdateResponse{") s = append(s, "}") return strings.Join(s, "") } -func (this *PauseContainerRequest) GoString() string { +func (this *PauseRequest) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&api.PauseContainerRequest{") + s = append(s, "&execution.PauseRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "}") return strings.Join(s, "") } -func (this *PauseContainerResponse) GoString() string { +func (this *PauseResponse) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.PauseContainerResponse{") + s = append(s, "&execution.PauseResponse{") s = append(s, "}") return strings.Join(s, "") } -func (this *ResumeContainerRequest) GoString() string { +func (this *ResumeRequest) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 5) - s = append(s, "&api.ResumeContainerRequest{") + s = append(s, "&execution.ResumeRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "}") return strings.Join(s, "") } -func (this *ResumeContainerResponse) GoString() string { +func (this *ResumeResponse) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.ResumeContainerResponse{") + s = append(s, "&execution.ResumeResponse{") s = append(s, "}") return strings.Join(s, "") } @@ -692,7 +686,7 @@ func (this *CreateProcessRequest) GoString() string { return "nil" } s := make([]string, 0, 6) - s = append(s, "&api.CreateProcessRequest{") + s = append(s, "&execution.CreateProcessRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") if this.Spec != nil { s = append(s, "Spec: "+fmt.Sprintf("%#v", this.Spec)+",\n") @@ -705,7 +699,7 @@ func (this *CreateProcessResponse) GoString() string { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.CreateProcessResponse{") + s = append(s, "&execution.CreateProcessResponse{") s = append(s, "}") return strings.Join(s, "") } @@ -714,7 +708,7 @@ func (this *StartProcessRequest) GoString() string { return "nil" } s := make([]string, 0, 6) - s = append(s, "&api.StartProcessRequest{") + s = append(s, "&execution.StartProcessRequest{") s = append(s, "Cid: "+fmt.Sprintf("%#v", this.Cid)+",\n") s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n") s = append(s, "}") @@ -725,7 +719,7 @@ func (this *StartProcessResponse) GoString() string { return "nil" } s := make([]string, 0, 5) - s = append(s, "&api.StartProcessResponse{") + s = append(s, "&execution.StartProcessResponse{") s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n") s = append(s, "}") return strings.Join(s, "") @@ -735,7 +729,7 @@ func (this *ProcessStateRequest) GoString() string { return "nil" } s := make([]string, 0, 6) - s = append(s, "&api.ProcessStateRequest{") + s = append(s, "&execution.ProcessStateRequest{") s = append(s, "Cid: "+fmt.Sprintf("%#v", this.Cid)+",\n") s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n") s = append(s, "}") @@ -746,7 +740,7 @@ func (this *ProcessStateResponse) GoString() string { return "nil" } s := make([]string, 0, 5) - s = append(s, "&api.ProcessStateResponse{") + s = append(s, "&execution.ProcessStateResponse{") if this.State != nil { s = append(s, "State: "+fmt.Sprintf("%#v", this.State)+",\n") } @@ -758,7 +752,7 @@ func (this *SignalProcessRequest) GoString() string { return "nil" } s := make([]string, 0, 7) - s = append(s, "&api.SignalProcessRequest{") + s = append(s, "&execution.SignalProcessRequest{") s = append(s, "Cid: "+fmt.Sprintf("%#v", this.Cid)+",\n") s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n") s = append(s, "Signal: "+fmt.Sprintf("%#v", this.Signal)+",\n") @@ -770,7 +764,7 @@ func (this *SignalProcessResponse) GoString() string { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.SignalProcessResponse{") + s = append(s, "&execution.SignalProcessResponse{") s = append(s, "}") return strings.Join(s, "") } @@ -779,7 +773,7 @@ func (this *DeleteProcessRequest) GoString() string { return "nil" } s := make([]string, 0, 6) - s = append(s, "&api.DeleteProcessRequest{") + s = append(s, "&execution.DeleteProcessRequest{") s = append(s, "Cid: "+fmt.Sprintf("%#v", this.Cid)+",\n") s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n") s = append(s, "}") @@ -790,7 +784,7 @@ func (this *DeleteProcessResponse) GoString() string { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.DeleteProcessResponse{") + s = append(s, "&execution.DeleteProcessResponse{") s = append(s, "}") return strings.Join(s, "") } @@ -799,7 +793,7 @@ func (this *ProcessListRequest) GoString() string { return "nil" } s := make([]string, 0, 5) - s = append(s, "&api.ProcessListRequest{") + s = append(s, "&execution.ProcessListRequest{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "}") return strings.Join(s, "") @@ -809,7 +803,7 @@ func (this *ProcessListResponse) GoString() string { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.ProcessListResponse{") + s = append(s, "&execution.ProcessListResponse{") s = append(s, "}") return strings.Join(s, "") } @@ -818,7 +812,7 @@ func (this *EventsRequest) GoString() string { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.EventsRequest{") + s = append(s, "&execution.EventsRequest{") s = append(s, "}") return strings.Join(s, "") } @@ -827,7 +821,7 @@ func (this *EventsResponse) GoString() string { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.EventsResponse{") + s = append(s, "&execution.EventsResponse{") s = append(s, "}") return strings.Join(s, "") } @@ -866,16 +860,16 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// Client API for Execution service +// Client API for Containers service -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) +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) 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) @@ -883,149 +877,149 @@ type ExecutionClient 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) (Execution_EventsClient, error) + Events(ctx context.Context, in *EventsRequest, opts ...grpc.CallOption) (Containers_EventsClient, error) } -type executionClient struct { +type containersClient struct { cc *grpc.ClientConn } -func NewExecutionClient(cc *grpc.ClientConn) ExecutionClient { - return &executionClient{cc} +func NewContainersClient(cc *grpc.ClientConn) ContainersClient { + return &containersClient{cc} } -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...) +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...) if err != nil { return nil, err } return out, nil } -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...) +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...) if err != nil { return nil, err } return out, nil } -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...) +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...) if err != nil { return nil, err } return out, nil } -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...) +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...) if err != nil { return nil, err } return out, nil } -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...) +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...) if err != nil { return nil, err } return out, nil } -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...) +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...) if err != nil { return nil, err } return out, nil } -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...) +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...) if err != nil { return nil, err } return out, nil } -func (c *executionClient) ContainerList(ctx context.Context, in *ContainerListRequest, opts ...grpc.CallOption) (*ContainerListResponse, error) { +func (c *containersClient) ContainerList(ctx context.Context, in *ContainerListRequest, opts ...grpc.CallOption) (*ContainerListResponse, error) { out := new(ContainerListResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Execution/ContainerList", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.Containers/ContainerList", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *executionClient) CreateProcess(ctx context.Context, in *CreateProcessRequest, opts ...grpc.CallOption) (*CreateProcessResponse, error) { +func (c *containersClient) CreateProcess(ctx context.Context, in *CreateProcessRequest, opts ...grpc.CallOption) (*CreateProcessResponse, error) { out := new(CreateProcessResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Execution/CreateProcess", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.Containers/CreateProcess", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *executionClient) StartProcess(ctx context.Context, in *StartProcessRequest, opts ...grpc.CallOption) (*StartProcessResponse, error) { +func (c *containersClient) StartProcess(ctx context.Context, in *StartProcessRequest, opts ...grpc.CallOption) (*StartProcessResponse, error) { out := new(StartProcessResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Execution/StartProcess", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.Containers/StartProcess", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *executionClient) ProcessState(ctx context.Context, in *ProcessStateRequest, opts ...grpc.CallOption) (*ProcessStateResponse, error) { +func (c *containersClient) ProcessState(ctx context.Context, in *ProcessStateRequest, opts ...grpc.CallOption) (*ProcessStateResponse, error) { out := new(ProcessStateResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Execution/ProcessState", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.Containers/ProcessState", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *executionClient) SignalProcess(ctx context.Context, in *SignalProcessRequest, opts ...grpc.CallOption) (*SignalProcessResponse, error) { +func (c *containersClient) SignalProcess(ctx context.Context, in *SignalProcessRequest, opts ...grpc.CallOption) (*SignalProcessResponse, error) { out := new(SignalProcessResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Execution/SignalProcess", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.Containers/SignalProcess", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *executionClient) DeleteProcess(ctx context.Context, in *DeleteProcessRequest, opts ...grpc.CallOption) (*DeleteProcessResponse, error) { +func (c *containersClient) DeleteProcess(ctx context.Context, in *DeleteProcessRequest, opts ...grpc.CallOption) (*DeleteProcessResponse, error) { out := new(DeleteProcessResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Execution/DeleteProcess", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.Containers/DeleteProcess", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *executionClient) ProcessList(ctx context.Context, in *ProcessListRequest, opts ...grpc.CallOption) (*ProcessListResponse, error) { +func (c *containersClient) ProcessList(ctx context.Context, in *ProcessListRequest, opts ...grpc.CallOption) (*ProcessListResponse, error) { out := new(ProcessListResponse) - err := grpc.Invoke(ctx, "/containerd.v1.Execution/ProcessList", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.Containers/ProcessList", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -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...) +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...) if err != nil { return nil, err } - x := &executionEventsClient{stream} + x := &containersEventsClient{stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -1035,16 +1029,16 @@ func (c *executionClient) Events(ctx context.Context, in *EventsRequest, opts .. return x, nil } -type Execution_EventsClient interface { +type Containers_EventsClient interface { Recv() (*EventsResponse, error) grpc.ClientStream } -type executionEventsClient struct { +type containersEventsClient struct { grpc.ClientStream } -func (x *executionEventsClient) Recv() (*EventsResponse, error) { +func (x *containersEventsClient) Recv() (*EventsResponse, error) { m := new(EventsResponse) if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err @@ -1052,16 +1046,16 @@ func (x *executionEventsClient) Recv() (*EventsResponse, error) { return m, nil } -// Server API for Execution service +// Server API for Containers service -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) +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) ContainerList(context.Context, *ContainerListRequest) (*ContainerListResponse, error) CreateProcess(context.Context, *CreateProcessRequest) (*CreateProcessResponse, error) StartProcess(context.Context, *StartProcessRequest) (*StartProcessResponse, error) @@ -1069,355 +1063,355 @@ type ExecutionServer interface { SignalProcess(context.Context, *SignalProcessRequest) (*SignalProcessResponse, error) DeleteProcess(context.Context, *DeleteProcessRequest) (*DeleteProcessResponse, error) ProcessList(context.Context, *ProcessListRequest) (*ProcessListResponse, error) - Events(*EventsRequest, Execution_EventsServer) error + Events(*EventsRequest, Containers_EventsServer) error } -func RegisterExecutionServer(s *grpc.Server, srv ExecutionServer) { - s.RegisterService(&_Execution_serviceDesc, srv) +func RegisterContainersServer(s *grpc.Server, srv ContainersServer) { + s.RegisterService(&_Containers_serviceDesc, srv) } -func _Execution_CreateContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(CreateContainerRequest) +func _Containers_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ExecutionServer).CreateContainer(ctx, in) + return srv.(ContainersServer).Create(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Execution/CreateContainer", + FullMethod: "/containerd.v1.Containers/Create", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExecutionServer).CreateContainer(ctx, req.(*CreateContainerRequest)) + return srv.(ContainersServer).Create(ctx, req.(*CreateRequest)) } return interceptor(ctx, in, info, handler) } -func _Execution_StartContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(StartContainerRequest) +func _Containers_Start_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(StartRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ExecutionServer).StartContainer(ctx, in) + return srv.(ContainersServer).Start(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Execution/StartContainer", + FullMethod: "/containerd.v1.Containers/Start", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExecutionServer).StartContainer(ctx, req.(*StartContainerRequest)) + return srv.(ContainersServer).Start(ctx, req.(*StartRequest)) } return interceptor(ctx, in, info, handler) } -func _Execution_DeleteContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(DeleteContainerRequest) +func _Containers_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ExecutionServer).DeleteContainer(ctx, in) + return srv.(ContainersServer).Delete(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Execution/DeleteContainer", + FullMethod: "/containerd.v1.Containers/Delete", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExecutionServer).DeleteContainer(ctx, req.(*DeleteContainerRequest)) + return srv.(ContainersServer).Delete(ctx, req.(*DeleteRequest)) } return interceptor(ctx, in, info, handler) } -func _Execution_StateContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(StateContainerRequest) +func _Containers_State_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(StateRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ExecutionServer).StateContainer(ctx, in) + return srv.(ContainersServer).State(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Execution/StateContainer", + FullMethod: "/containerd.v1.Containers/State", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExecutionServer).StateContainer(ctx, req.(*StateContainerRequest)) + return srv.(ContainersServer).State(ctx, req.(*StateRequest)) } return interceptor(ctx, in, info, handler) } -func _Execution_UpdateContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(UpdateContainerRequest) +func _Containers_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ExecutionServer).UpdateContainer(ctx, in) + return srv.(ContainersServer).Update(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Execution/UpdateContainer", + FullMethod: "/containerd.v1.Containers/Update", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExecutionServer).UpdateContainer(ctx, req.(*UpdateContainerRequest)) + return srv.(ContainersServer).Update(ctx, req.(*UpdateRequest)) } return interceptor(ctx, in, info, handler) } -func _Execution_PauseContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(PauseContainerRequest) +func _Containers_Pause_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(PauseRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ExecutionServer).PauseContainer(ctx, in) + return srv.(ContainersServer).Pause(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Execution/PauseContainer", + FullMethod: "/containerd.v1.Containers/Pause", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExecutionServer).PauseContainer(ctx, req.(*PauseContainerRequest)) + return srv.(ContainersServer).Pause(ctx, req.(*PauseRequest)) } return interceptor(ctx, in, info, handler) } -func _Execution_ResumeContainer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ResumeContainerRequest) +func _Containers_Resume_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ResumeRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ExecutionServer).ResumeContainer(ctx, in) + return srv.(ContainersServer).Resume(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Execution/ResumeContainer", + FullMethod: "/containerd.v1.Containers/Resume", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExecutionServer).ResumeContainer(ctx, req.(*ResumeContainerRequest)) + return srv.(ContainersServer).Resume(ctx, req.(*ResumeRequest)) } return interceptor(ctx, in, info, handler) } -func _Execution_ContainerList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Containers_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.(ExecutionServer).ContainerList(ctx, in) + return srv.(ContainersServer).ContainerList(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Execution/ContainerList", + FullMethod: "/containerd.v1.Containers/ContainerList", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExecutionServer).ContainerList(ctx, req.(*ContainerListRequest)) + return srv.(ContainersServer).ContainerList(ctx, req.(*ContainerListRequest)) } return interceptor(ctx, in, info, handler) } -func _Execution_CreateProcess_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Containers_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.(ExecutionServer).CreateProcess(ctx, in) + return srv.(ContainersServer).CreateProcess(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Execution/CreateProcess", + FullMethod: "/containerd.v1.Containers/CreateProcess", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExecutionServer).CreateProcess(ctx, req.(*CreateProcessRequest)) + return srv.(ContainersServer).CreateProcess(ctx, req.(*CreateProcessRequest)) } return interceptor(ctx, in, info, handler) } -func _Execution_StartProcess_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Containers_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.(ExecutionServer).StartProcess(ctx, in) + return srv.(ContainersServer).StartProcess(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Execution/StartProcess", + FullMethod: "/containerd.v1.Containers/StartProcess", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExecutionServer).StartProcess(ctx, req.(*StartProcessRequest)) + return srv.(ContainersServer).StartProcess(ctx, req.(*StartProcessRequest)) } return interceptor(ctx, in, info, handler) } -func _Execution_ProcessState_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Containers_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.(ExecutionServer).ProcessState(ctx, in) + return srv.(ContainersServer).ProcessState(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Execution/ProcessState", + FullMethod: "/containerd.v1.Containers/ProcessState", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExecutionServer).ProcessState(ctx, req.(*ProcessStateRequest)) + return srv.(ContainersServer).ProcessState(ctx, req.(*ProcessStateRequest)) } return interceptor(ctx, in, info, handler) } -func _Execution_SignalProcess_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Containers_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.(ExecutionServer).SignalProcess(ctx, in) + return srv.(ContainersServer).SignalProcess(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Execution/SignalProcess", + FullMethod: "/containerd.v1.Containers/SignalProcess", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExecutionServer).SignalProcess(ctx, req.(*SignalProcessRequest)) + return srv.(ContainersServer).SignalProcess(ctx, req.(*SignalProcessRequest)) } return interceptor(ctx, in, info, handler) } -func _Execution_DeleteProcess_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Containers_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.(ExecutionServer).DeleteProcess(ctx, in) + return srv.(ContainersServer).DeleteProcess(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Execution/DeleteProcess", + FullMethod: "/containerd.v1.Containers/DeleteProcess", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExecutionServer).DeleteProcess(ctx, req.(*DeleteProcessRequest)) + return srv.(ContainersServer).DeleteProcess(ctx, req.(*DeleteProcessRequest)) } return interceptor(ctx, in, info, handler) } -func _Execution_ProcessList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Containers_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.(ExecutionServer).ProcessList(ctx, in) + return srv.(ContainersServer).ProcessList(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.Execution/ProcessList", + FullMethod: "/containerd.v1.Containers/ProcessList", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExecutionServer).ProcessList(ctx, req.(*ProcessListRequest)) + return srv.(ContainersServer).ProcessList(ctx, req.(*ProcessListRequest)) } return interceptor(ctx, in, info, handler) } -func _Execution_Events_Handler(srv interface{}, stream grpc.ServerStream) error { +func _Containers_Events_Handler(srv interface{}, stream grpc.ServerStream) error { m := new(EventsRequest) if err := stream.RecvMsg(m); err != nil { return err } - return srv.(ExecutionServer).Events(m, &executionEventsServer{stream}) + return srv.(ContainersServer).Events(m, &containersEventsServer{stream}) } -type Execution_EventsServer interface { +type Containers_EventsServer interface { Send(*EventsResponse) error grpc.ServerStream } -type executionEventsServer struct { +type containersEventsServer struct { grpc.ServerStream } -func (x *executionEventsServer) Send(m *EventsResponse) error { +func (x *containersEventsServer) Send(m *EventsResponse) error { return x.ServerStream.SendMsg(m) } -var _Execution_serviceDesc = grpc.ServiceDesc{ - ServiceName: "containerd.v1.Execution", - HandlerType: (*ExecutionServer)(nil), +var _Containers_serviceDesc = grpc.ServiceDesc{ + ServiceName: "containerd.v1.Containers", + HandlerType: (*ContainersServer)(nil), Methods: []grpc.MethodDesc{ { - MethodName: "CreateContainer", - Handler: _Execution_CreateContainer_Handler, + MethodName: "Create", + Handler: _Containers_Create_Handler, }, { - MethodName: "StartContainer", - Handler: _Execution_StartContainer_Handler, + MethodName: "Start", + Handler: _Containers_Start_Handler, }, { - MethodName: "DeleteContainer", - Handler: _Execution_DeleteContainer_Handler, + MethodName: "Delete", + Handler: _Containers_Delete_Handler, }, { - MethodName: "StateContainer", - Handler: _Execution_StateContainer_Handler, + MethodName: "State", + Handler: _Containers_State_Handler, }, { - MethodName: "UpdateContainer", - Handler: _Execution_UpdateContainer_Handler, + MethodName: "Update", + Handler: _Containers_Update_Handler, }, { - MethodName: "PauseContainer", - Handler: _Execution_PauseContainer_Handler, + MethodName: "Pause", + Handler: _Containers_Pause_Handler, }, { - MethodName: "ResumeContainer", - Handler: _Execution_ResumeContainer_Handler, + MethodName: "Resume", + Handler: _Containers_Resume_Handler, }, { MethodName: "ContainerList", - Handler: _Execution_ContainerList_Handler, + Handler: _Containers_ContainerList_Handler, }, { MethodName: "CreateProcess", - Handler: _Execution_CreateProcess_Handler, + Handler: _Containers_CreateProcess_Handler, }, { MethodName: "StartProcess", - Handler: _Execution_StartProcess_Handler, + Handler: _Containers_StartProcess_Handler, }, { MethodName: "ProcessState", - Handler: _Execution_ProcessState_Handler, + Handler: _Containers_ProcessState_Handler, }, { MethodName: "SignalProcess", - Handler: _Execution_SignalProcess_Handler, + Handler: _Containers_SignalProcess_Handler, }, { MethodName: "DeleteProcess", - Handler: _Execution_DeleteProcess_Handler, + Handler: _Containers_DeleteProcess_Handler, }, { MethodName: "ProcessList", - Handler: _Execution_ProcessList_Handler, + Handler: _Containers_ProcessList_Handler, }, }, Streams: []grpc.StreamDesc{ { StreamName: "Events", - Handler: _Execution_Events_Handler, + Handler: _Containers_Events_Handler, ServerStreams: true, }, }, - Metadata: "api/execution.proto", + Metadata: "execution.proto", } func (m *Container) Marshal() (dAtA []byte, err error) { @@ -1739,7 +1733,7 @@ func (m *User) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *CreateContainerRequest) Marshal() (dAtA []byte, err error) { +func (m *CreateRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -1749,7 +1743,7 @@ func (m *CreateContainerRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *CreateContainerRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *CreateRequest) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -1797,7 +1791,7 @@ func (m *CreateContainerRequest) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *CreateContainerResponse) Marshal() (dAtA []byte, err error) { +func (m *CreateResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -1807,7 +1801,7 @@ func (m *CreateContainerResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *CreateContainerResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *CreateResponse) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -1825,7 +1819,7 @@ func (m *CreateContainerResponse) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *StartContainerRequest) Marshal() (dAtA []byte, err error) { +func (m *StartRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -1835,7 +1829,7 @@ func (m *StartContainerRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *StartContainerRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *StartRequest) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -1867,7 +1861,7 @@ func (m *State) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *StartContainerResponse) Marshal() (dAtA []byte, err error) { +func (m *StartResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -1877,7 +1871,7 @@ func (m *StartContainerResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *StartContainerResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *StartResponse) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -1895,7 +1889,7 @@ func (m *StartContainerResponse) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *DeleteContainerRequest) Marshal() (dAtA []byte, err error) { +func (m *DeleteRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -1905,7 +1899,7 @@ func (m *DeleteContainerRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *DeleteContainerRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *DeleteRequest) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -1919,7 +1913,7 @@ func (m *DeleteContainerRequest) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *DeleteContainerResponse) Marshal() (dAtA []byte, err error) { +func (m *DeleteResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -1929,7 +1923,7 @@ func (m *DeleteContainerResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *DeleteContainerResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *DeleteResponse) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2000,7 +1994,7 @@ func (m *ContainerListResponse) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *StateContainerRequest) Marshal() (dAtA []byte, err error) { +func (m *StateRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2010,7 +2004,7 @@ func (m *StateContainerRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *StateContainerRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *StateRequest) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2024,7 +2018,7 @@ func (m *StateContainerRequest) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *StateContainerResponse) Marshal() (dAtA []byte, err error) { +func (m *StateResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2034,7 +2028,7 @@ func (m *StateContainerResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *StateContainerResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *StateResponse) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2052,7 +2046,7 @@ func (m *StateContainerResponse) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *UpdateContainerRequest) Marshal() (dAtA []byte, err error) { +func (m *UpdateRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2062,7 +2056,7 @@ func (m *UpdateContainerRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *UpdateContainerRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *UpdateRequest) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2076,7 +2070,7 @@ func (m *UpdateContainerRequest) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *UpdateContainerResponse) Marshal() (dAtA []byte, err error) { +func (m *UpdateResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2086,7 +2080,7 @@ func (m *UpdateContainerResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *UpdateContainerResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *UpdateResponse) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2094,7 +2088,7 @@ func (m *UpdateContainerResponse) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *PauseContainerRequest) Marshal() (dAtA []byte, err error) { +func (m *PauseRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2104,7 +2098,7 @@ func (m *PauseContainerRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *PauseContainerRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *PauseRequest) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2118,7 +2112,7 @@ func (m *PauseContainerRequest) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *PauseContainerResponse) Marshal() (dAtA []byte, err error) { +func (m *PauseResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2128,7 +2122,7 @@ func (m *PauseContainerResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *PauseContainerResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *PauseResponse) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2136,7 +2130,7 @@ func (m *PauseContainerResponse) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *ResumeContainerRequest) Marshal() (dAtA []byte, err error) { +func (m *ResumeRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2146,7 +2140,7 @@ func (m *ResumeContainerRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ResumeContainerRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *ResumeRequest) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2160,7 +2154,7 @@ func (m *ResumeContainerRequest) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *ResumeContainerResponse) Marshal() (dAtA []byte, err error) { +func (m *ResumeResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2170,7 +2164,7 @@ func (m *ResumeContainerResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ResumeContainerResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *ResumeResponse) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -2687,7 +2681,7 @@ func (m *User) Size() (n int) { return n } -func (m *CreateContainerRequest) Size() (n int) { +func (m *CreateRequest) Size() (n int) { var l int _ = l l = len(m.ID) @@ -2715,7 +2709,7 @@ func (m *CreateContainerRequest) Size() (n int) { return n } -func (m *CreateContainerResponse) Size() (n int) { +func (m *CreateResponse) Size() (n int) { var l int _ = l if m.Container != nil { @@ -2725,7 +2719,7 @@ func (m *CreateContainerResponse) Size() (n int) { return n } -func (m *StartContainerRequest) Size() (n int) { +func (m *StartRequest) Size() (n int) { var l int _ = l l = len(m.ID) @@ -2741,7 +2735,7 @@ func (m *State) Size() (n int) { return n } -func (m *StartContainerResponse) Size() (n int) { +func (m *StartResponse) Size() (n int) { var l int _ = l if m.State != nil { @@ -2751,7 +2745,7 @@ func (m *StartContainerResponse) Size() (n int) { return n } -func (m *DeleteContainerRequest) Size() (n int) { +func (m *DeleteRequest) Size() (n int) { var l int _ = l l = len(m.ID) @@ -2761,7 +2755,7 @@ func (m *DeleteContainerRequest) Size() (n int) { return n } -func (m *DeleteContainerResponse) Size() (n int) { +func (m *DeleteResponse) Size() (n int) { var l int _ = l return n @@ -2791,7 +2785,7 @@ func (m *ContainerListResponse) Size() (n int) { return n } -func (m *StateContainerRequest) Size() (n int) { +func (m *StateRequest) Size() (n int) { var l int _ = l l = len(m.ID) @@ -2801,7 +2795,7 @@ func (m *StateContainerRequest) Size() (n int) { return n } -func (m *StateContainerResponse) Size() (n int) { +func (m *StateResponse) Size() (n int) { var l int _ = l if m.Container != nil { @@ -2811,7 +2805,7 @@ func (m *StateContainerResponse) Size() (n int) { return n } -func (m *UpdateContainerRequest) Size() (n int) { +func (m *UpdateRequest) Size() (n int) { var l int _ = l l = len(m.ID) @@ -2821,13 +2815,13 @@ func (m *UpdateContainerRequest) Size() (n int) { return n } -func (m *UpdateContainerResponse) Size() (n int) { +func (m *UpdateResponse) Size() (n int) { var l int _ = l return n } -func (m *PauseContainerRequest) Size() (n int) { +func (m *PauseRequest) Size() (n int) { var l int _ = l l = len(m.ID) @@ -2837,13 +2831,13 @@ func (m *PauseContainerRequest) Size() (n int) { return n } -func (m *PauseContainerResponse) Size() (n int) { +func (m *PauseResponse) Size() (n int) { var l int _ = l return n } -func (m *ResumeContainerRequest) Size() (n int) { +func (m *ResumeRequest) Size() (n int) { var l int _ = l l = len(m.ID) @@ -2853,7 +2847,7 @@ func (m *ResumeContainerRequest) Size() (n int) { return n } -func (m *ResumeContainerResponse) Size() (n int) { +func (m *ResumeResponse) Size() (n int) { var l int _ = l return n @@ -3080,11 +3074,11 @@ func (this *User) String() string { }, "") return s } -func (this *CreateContainerRequest) String() string { +func (this *CreateRequest) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&CreateContainerRequest{`, + s := strings.Join([]string{`&CreateRequest{`, `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) + `,`, @@ -3094,21 +3088,21 @@ func (this *CreateContainerRequest) String() string { }, "") return s } -func (this *CreateContainerResponse) String() string { +func (this *CreateResponse) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&CreateContainerResponse{`, + s := strings.Join([]string{`&CreateResponse{`, `Container:` + strings.Replace(fmt.Sprintf("%v", this.Container), "Container", "Container", 1) + `,`, `}`, }, "") return s } -func (this *StartContainerRequest) String() string { +func (this *StartRequest) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&StartContainerRequest{`, + s := strings.Join([]string{`&StartRequest{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `}`, }, "") @@ -3123,31 +3117,31 @@ func (this *State) String() string { }, "") return s } -func (this *StartContainerResponse) String() string { +func (this *StartResponse) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&StartContainerResponse{`, + s := strings.Join([]string{`&StartResponse{`, `State:` + strings.Replace(fmt.Sprintf("%v", this.State), "State", "State", 1) + `,`, `}`, }, "") return s } -func (this *DeleteContainerRequest) String() string { +func (this *DeleteRequest) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&DeleteContainerRequest{`, + s := strings.Join([]string{`&DeleteRequest{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `}`, }, "") return s } -func (this *DeleteContainerResponse) String() string { +func (this *DeleteResponse) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&DeleteContainerResponse{`, + s := strings.Join([]string{`&DeleteResponse{`, `}`, }, "") return s @@ -3172,79 +3166,79 @@ func (this *ContainerListResponse) String() string { }, "") return s } -func (this *StateContainerRequest) String() string { +func (this *StateRequest) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&StateContainerRequest{`, + s := strings.Join([]string{`&StateRequest{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `}`, }, "") return s } -func (this *StateContainerResponse) String() string { +func (this *StateResponse) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&StateContainerResponse{`, + s := strings.Join([]string{`&StateResponse{`, `Container:` + strings.Replace(fmt.Sprintf("%v", this.Container), "Container", "Container", 1) + `,`, `}`, }, "") return s } -func (this *UpdateContainerRequest) String() string { +func (this *UpdateRequest) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&UpdateContainerRequest{`, + s := strings.Join([]string{`&UpdateRequest{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `}`, }, "") return s } -func (this *UpdateContainerResponse) String() string { +func (this *UpdateResponse) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&UpdateContainerResponse{`, + s := strings.Join([]string{`&UpdateResponse{`, `}`, }, "") return s } -func (this *PauseContainerRequest) String() string { +func (this *PauseRequest) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&PauseContainerRequest{`, + s := strings.Join([]string{`&PauseRequest{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `}`, }, "") return s } -func (this *PauseContainerResponse) String() string { +func (this *PauseResponse) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&PauseContainerResponse{`, + s := strings.Join([]string{`&PauseResponse{`, `}`, }, "") return s } -func (this *ResumeContainerRequest) String() string { +func (this *ResumeRequest) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&ResumeContainerRequest{`, + s := strings.Join([]string{`&ResumeRequest{`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `}`, }, "") return s } -func (this *ResumeContainerResponse) String() string { +func (this *ResumeResponse) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&ResumeContainerResponse{`, + s := strings.Join([]string{`&ResumeResponse{`, `}`, }, "") return s @@ -4371,7 +4365,7 @@ func (m *User) Unmarshal(dAtA []byte) error { } return nil } -func (m *CreateContainerRequest) Unmarshal(dAtA []byte) error { +func (m *CreateRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4394,10 +4388,10 @@ func (m *CreateContainerRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: CreateContainerRequest: wiretype end group for non-group") + return fmt.Errorf("proto: CreateRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: CreateContainerRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: CreateRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4572,7 +4566,7 @@ func (m *CreateContainerRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *CreateContainerResponse) Unmarshal(dAtA []byte) error { +func (m *CreateResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4595,10 +4589,10 @@ func (m *CreateContainerResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: CreateContainerResponse: wiretype end group for non-group") + return fmt.Errorf("proto: CreateResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: CreateContainerResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: CreateResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4655,7 +4649,7 @@ func (m *CreateContainerResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *StartContainerRequest) Unmarshal(dAtA []byte) error { +func (m *StartRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4678,10 +4672,10 @@ func (m *StartContainerRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: StartContainerRequest: wiretype end group for non-group") + return fmt.Errorf("proto: StartRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: StartContainerRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: StartRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4784,7 +4778,7 @@ func (m *State) Unmarshal(dAtA []byte) error { } return nil } -func (m *StartContainerResponse) Unmarshal(dAtA []byte) error { +func (m *StartResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4807,10 +4801,10 @@ func (m *StartContainerResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: StartContainerResponse: wiretype end group for non-group") + return fmt.Errorf("proto: StartResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: StartContainerResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: StartResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4867,7 +4861,7 @@ func (m *StartContainerResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *DeleteContainerRequest) Unmarshal(dAtA []byte) error { +func (m *DeleteRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4890,10 +4884,10 @@ func (m *DeleteContainerRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: DeleteContainerRequest: wiretype end group for non-group") + return fmt.Errorf("proto: DeleteRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: DeleteContainerRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: DeleteRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4946,7 +4940,7 @@ func (m *DeleteContainerRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *DeleteContainerResponse) Unmarshal(dAtA []byte) error { +func (m *DeleteResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4969,10 +4963,10 @@ func (m *DeleteContainerResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: DeleteContainerResponse: wiretype end group for non-group") + return fmt.Errorf("proto: DeleteResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: DeleteContainerResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: DeleteResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -5156,7 +5150,7 @@ func (m *ContainerListResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *StateContainerRequest) Unmarshal(dAtA []byte) error { +func (m *StateRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5179,10 +5173,10 @@ func (m *StateContainerRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: StateContainerRequest: wiretype end group for non-group") + return fmt.Errorf("proto: StateRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: StateContainerRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: StateRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5235,7 +5229,7 @@ func (m *StateContainerRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *StateContainerResponse) Unmarshal(dAtA []byte) error { +func (m *StateResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5258,10 +5252,10 @@ func (m *StateContainerResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: StateContainerResponse: wiretype end group for non-group") + return fmt.Errorf("proto: StateResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: StateContainerResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: StateResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5318,7 +5312,7 @@ func (m *StateContainerResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *UpdateContainerRequest) Unmarshal(dAtA []byte) error { +func (m *UpdateRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5341,10 +5335,10 @@ func (m *UpdateContainerRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UpdateContainerRequest: wiretype end group for non-group") + return fmt.Errorf("proto: UpdateRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UpdateContainerRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: UpdateRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5397,7 +5391,7 @@ func (m *UpdateContainerRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *UpdateContainerResponse) Unmarshal(dAtA []byte) error { +func (m *UpdateResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5420,10 +5414,10 @@ func (m *UpdateContainerResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: UpdateContainerResponse: wiretype end group for non-group") + return fmt.Errorf("proto: UpdateResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: UpdateContainerResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: UpdateResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -5447,7 +5441,7 @@ func (m *UpdateContainerResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *PauseContainerRequest) Unmarshal(dAtA []byte) error { +func (m *PauseRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5470,10 +5464,10 @@ func (m *PauseContainerRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: PauseContainerRequest: wiretype end group for non-group") + return fmt.Errorf("proto: PauseRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: PauseContainerRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: PauseRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5526,7 +5520,7 @@ func (m *PauseContainerRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *PauseContainerResponse) Unmarshal(dAtA []byte) error { +func (m *PauseResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5549,10 +5543,10 @@ func (m *PauseContainerResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: PauseContainerResponse: wiretype end group for non-group") + return fmt.Errorf("proto: PauseResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: PauseContainerResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: PauseResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -5576,7 +5570,7 @@ func (m *PauseContainerResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *ResumeContainerRequest) Unmarshal(dAtA []byte) error { +func (m *ResumeRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5599,10 +5593,10 @@ func (m *ResumeContainerRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ResumeContainerRequest: wiretype end group for non-group") + return fmt.Errorf("proto: ResumeRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ResumeContainerRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: ResumeRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5655,7 +5649,7 @@ func (m *ResumeContainerRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *ResumeContainerResponse) Unmarshal(dAtA []byte) error { +func (m *ResumeResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5678,10 +5672,10 @@ func (m *ResumeContainerResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ResumeContainerResponse: wiretype end group for non-group") + return fmt.Errorf("proto: ResumeResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ResumeContainerResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: ResumeResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -6904,75 +6898,74 @@ var ( ErrIntOverflowExecution = fmt.Errorf("proto: integer overflow") ) -func init() { proto.RegisterFile("api/execution.proto", fileDescriptorExecution) } +func init() { proto.RegisterFile("execution.proto", fileDescriptorExecution) } var fileDescriptorExecution = []byte{ - // 1070 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x57, 0xdd, 0x6e, 0x1b, 0x45, - 0x14, 0xee, 0xfa, 0xb7, 0x3e, 0xc6, 0x49, 0x35, 0xb1, 0x9d, 0xc5, 0x2a, 0x6e, 0x98, 0xa6, 0xc5, - 0x42, 0x95, 0x63, 0x02, 0x42, 0x94, 0xcb, 0x34, 0x55, 0x85, 0x04, 0x52, 0x3a, 0x21, 0x42, 0xaa, - 0x04, 0x64, 0xf1, 0x0e, 0xee, 0x4a, 0xc9, 0xee, 0xb2, 0x3b, 0x4e, 0xe1, 0x8e, 0xc7, 0x80, 0x37, - 0xaa, 0xc4, 0x4d, 0x2f, 0xb9, 0x42, 0xc4, 0x4f, 0x00, 0x6f, 0x80, 0xe6, 0x67, 0x37, 0xbb, 0x33, - 0xe3, 0xc4, 0xae, 0xb8, 0x3b, 0x73, 0xf6, 0x9c, 0x6f, 0xce, 0xef, 0x37, 0x36, 0x6c, 0x79, 0x71, - 0xb0, 0x47, 0x7f, 0xa6, 0xd3, 0x39, 0x0b, 0xa2, 0x70, 0x1c, 0x27, 0x11, 0x8b, 0x50, 0x67, 0x1a, - 0x85, 0xcc, 0x0b, 0x42, 0x9a, 0xf8, 0xe3, 0x8b, 0x8f, 0x06, 0xdd, 0x59, 0x34, 0x8b, 0xc4, 0x97, - 0x3d, 0x2e, 0x49, 0x23, 0xfc, 0xbb, 0x03, 0xad, 0x27, 0x99, 0x1d, 0xea, 0x43, 0x25, 0xf0, 0x5d, - 0x67, 0xc7, 0x19, 0xb5, 0x0e, 0x1a, 0x8b, 0xbf, 0xee, 0x55, 0xbe, 0x38, 0x24, 0x95, 0xc0, 0x47, - 0x8f, 0xa0, 0x71, 0x1e, 0xcd, 0x43, 0x96, 0xba, 0x95, 0x9d, 0xea, 0xa8, 0xbd, 0xdf, 0x1d, 0x97, - 0xb0, 0xc7, 0x5f, 0xf1, 0x8f, 0x44, 0xd9, 0xa0, 0x2e, 0xd4, 0xa3, 0x57, 0x21, 0x4d, 0xdc, 0x2a, - 0x07, 0x22, 0xf2, 0x80, 0x26, 0xd0, 0x8c, 0x93, 0x68, 0x4a, 0xd3, 0xd4, 0xad, 0xed, 0x38, 0xa3, - 0xf6, 0x7e, 0x5f, 0x03, 0x39, 0x92, 0x5f, 0x49, 0x66, 0x86, 0x7f, 0x73, 0xa0, 0xa9, 0x94, 0xe8, - 0x0e, 0x54, 0x63, 0x15, 0x5a, 0x8d, 0x70, 0x11, 0x21, 0xa8, 0x79, 0xc9, 0x4c, 0x46, 0xd4, 0x22, - 0x42, 0xe6, 0x56, 0x34, 0xbc, 0x70, 0xab, 0x42, 0xc5, 0x45, 0xf4, 0x01, 0xd4, 0xe6, 0x29, 0x4d, - 0xd4, 0x95, 0x5b, 0xda, 0x95, 0x27, 0x29, 0x4d, 0x88, 0x30, 0xe0, 0xae, 0xd3, 0x57, 0xbe, 0x5b, - 0x17, 0x21, 0x73, 0x11, 0x0d, 0xe0, 0x36, 0xa3, 0xc9, 0x79, 0x10, 0x7a, 0x67, 0x6e, 0x63, 0xc7, - 0x19, 0xdd, 0x26, 0xf9, 0x19, 0xbf, 0x71, 0xa0, 0xad, 0x42, 0x3b, 0x8e, 0xe9, 0x34, 0x0f, 0xc6, - 0x31, 0x83, 0xa9, 0x98, 0xc1, 0x54, 0x57, 0x0c, 0xa6, 0x66, 0x0f, 0xa6, 0x5e, 0x0e, 0x86, 0xd7, - 0x3b, 0x65, 0x7e, 0x10, 0x8a, 0x28, 0x5b, 0x44, 0x1e, 0x50, 0x1f, 0x1a, 0x29, 0xf3, 0xa3, 0x39, - 0x73, 0x9b, 0x42, 0xad, 0x4e, 0x4a, 0x4f, 0x93, 0xc4, 0xbd, 0x9d, 0xeb, 0x69, 0x92, 0x60, 0x0a, - 0x75, 0xd1, 0x46, 0x61, 0x10, 0xcd, 0x93, 0x29, 0x95, 0x83, 0x40, 0xd4, 0x89, 0xeb, 0x99, 0x97, - 0xcc, 0x28, 0x73, 0x2b, 0x52, 0x2f, 0x4f, 0x3c, 0x77, 0xf6, 0x4b, 0x4c, 0x55, 0xb7, 0x85, 0x8c, - 0x5c, 0x68, 0x46, 0x31, 0x9f, 0x45, 0xde, 0x6c, 0x9e, 0x7f, 0x76, 0xc4, 0x04, 0x6a, 0x27, 0x2a, - 0xc5, 0xb9, 0x6a, 0x68, 0x87, 0x70, 0x91, 0x6b, 0x66, 0x81, 0x2f, 0xc0, 0x3b, 0x84, 0x8b, 0xe8, - 0x21, 0x6c, 0x78, 0xbe, 0x1f, 0x70, 0x47, 0xef, 0xec, 0x59, 0xe0, 0xa7, 0xa2, 0xb3, 0x1d, 0xa2, - 0x69, 0xf1, 0x1f, 0x0e, 0xf4, 0x9f, 0x24, 0xd4, 0x63, 0x34, 0x1f, 0x65, 0x42, 0x7f, 0x9a, 0xd3, - 0x94, 0x2d, 0x9d, 0xe8, 0x4f, 0xae, 0xa6, 0xb1, 0x22, 0xba, 0x31, 0xb0, 0x4f, 0x23, 0xef, 0x6e, - 0x3e, 0x91, 0x85, 0x3d, 0xa8, 0xae, 0xb3, 0x07, 0xb5, 0xe2, 0x1e, 0xdc, 0x83, 0xf6, 0x34, 0x0a, - 0x7f, 0x0c, 0x66, 0xdf, 0xc7, 0x1e, 0x7b, 0xa9, 0x06, 0x0e, 0xa4, 0xea, 0xc8, 0x63, 0x2f, 0xf1, - 0x73, 0xd8, 0x36, 0x92, 0x49, 0xe3, 0x28, 0x4c, 0x29, 0xfa, 0x14, 0x5a, 0xf9, 0x85, 0x22, 0xa9, - 0xf6, 0xbe, 0xab, 0x85, 0x70, 0xe5, 0x74, 0x65, 0x8a, 0xf7, 0xa0, 0x77, 0xcc, 0xbc, 0x84, 0xad, - 0x5a, 0x1e, 0xdc, 0x84, 0xfa, 0x31, 0xf3, 0x18, 0xc5, 0x87, 0xd0, 0xd7, 0x3d, 0x55, 0x2c, 0x1f, - 0xf2, 0xa9, 0xf3, 0x18, 0x55, 0x71, 0xe8, 0xa5, 0x10, 0xee, 0x44, 0x9a, 0xe0, 0x09, 0xf4, 0x0f, - 0xe9, 0x19, 0x5d, 0xbd, 0x3f, 0xf8, 0x5d, 0xd8, 0x36, 0x3c, 0xe4, 0xc5, 0xf8, 0x11, 0x74, 0x73, - 0xe5, 0x97, 0x41, 0xca, 0x32, 0xa8, 0xbc, 0xdc, 0x72, 0x09, 0xe5, 0x01, 0x3f, 0x87, 0x9e, 0x66, - 0xad, 0xe2, 0xff, 0x0c, 0x20, 0x8f, 0x58, 0x2e, 0xee, 0x75, 0xc5, 0x2c, 0xd8, 0xaa, 0x6a, 0xae, - 0x91, 0xcc, 0x91, 0x28, 0xe2, 0xff, 0xd9, 0xd0, 0x09, 0xf4, 0x4f, 0x62, 0xdf, 0x5b, 0xaf, 0xa0, - 0x86, 0x87, 0x2a, 0xe8, 0x1e, 0xf4, 0x8e, 0xbc, 0x79, 0xba, 0x3a, 0x96, 0x0b, 0x7d, 0xdd, 0x41, - 0x41, 0x4d, 0xa0, 0x4f, 0x68, 0x3a, 0x3f, 0x5f, 0x2b, 0x2e, 0xc3, 0x43, 0x81, 0x7d, 0x07, 0x5d, - 0xb9, 0x08, 0xd9, 0xcb, 0x70, 0xc3, 0x4e, 0x8f, 0xa1, 0x96, 0xc6, 0x74, 0xba, 0xc2, 0x42, 0x0b, - 0x3b, 0xbc, 0x0d, 0x3d, 0x0d, 0x5f, 0x5d, 0xfc, 0x18, 0xb6, 0xc4, 0xd0, 0x6b, 0xf7, 0x72, 0x56, - 0xce, 0x2e, 0x26, 0x5c, 0xcc, 0x5e, 0x25, 0xc9, 0x87, 0x5c, 0xc4, 0x23, 0xe8, 0x96, 0x5d, 0x55, - 0xa3, 0x0b, 0xef, 0x57, 0x47, 0x5a, 0x3e, 0x86, 0xad, 0x2c, 0x24, 0xb1, 0x2a, 0x6b, 0x5c, 0x72, - 0x00, 0xdd, 0xb2, 0xeb, 0x5b, 0xac, 0x24, 0x81, 0xee, 0x71, 0x30, 0x0b, 0xbd, 0xb3, 0xf5, 0x93, - 0x14, 0x2f, 0x84, 0xf0, 0x15, 0x9c, 0xdf, 0x21, 0xea, 0xc4, 0x0b, 0xaa, 0x61, 0xaa, 0x82, 0x7e, - 0x0e, 0x5d, 0xb9, 0xcd, 0x6f, 0x51, 0xd1, 0x6d, 0xe8, 0x69, 0xbe, 0x39, 0x0f, 0x20, 0xa5, 0x2a, - 0xb2, 0xc0, 0xb2, 0x39, 0xeb, 0xe5, 0xe5, 0x2e, 0xb2, 0x00, 0xde, 0x84, 0xce, 0xd3, 0x0b, 0x1a, - 0xb2, 0x2c, 0x24, 0x7c, 0x07, 0x36, 0x32, 0x85, 0x34, 0xd9, 0xff, 0x17, 0xa0, 0xf5, 0x34, 0xfb, - 0x6d, 0x85, 0x4e, 0x61, 0x53, 0x63, 0x67, 0xf4, 0x40, 0xdf, 0x58, 0xeb, 0x53, 0x34, 0x78, 0x78, - 0x93, 0x99, 0xea, 0xe2, 0xb7, 0xb0, 0x51, 0xa6, 0x5c, 0xb4, 0x6b, 0x36, 0xd2, 0xe4, 0xf2, 0xc1, - 0x83, 0x1b, 0xac, 0x14, 0xfc, 0x29, 0x6c, 0x6a, 0xcc, 0x6a, 0x24, 0x60, 0xe7, 0x6a, 0x23, 0x81, - 0x25, 0x04, 0xad, 0x12, 0x28, 0x5e, 0xb0, 0x6b, 0x9b, 0xc4, 0x55, 0x12, 0xb0, 0xc1, 0x9f, 0xc2, - 0xa6, 0xc6, 0x64, 0x46, 0x02, 0x76, 0x6e, 0x34, 0x12, 0x58, 0x42, 0x88, 0x3c, 0x81, 0x32, 0xbf, - 0x19, 0x09, 0x58, 0xf9, 0xd2, 0x48, 0xc0, 0x4e, 0x92, 0x3c, 0x01, 0x8d, 0xf2, 0x8c, 0x04, 0xec, - 0x24, 0x6a, 0x24, 0xb0, 0x84, 0x39, 0xd1, 0x0b, 0xe8, 0x94, 0x1e, 0x3d, 0x74, 0x7f, 0xd9, 0xa3, - 0x52, 0x58, 0x9d, 0xc1, 0xee, 0xf5, 0x46, 0x05, 0xec, 0x22, 0x6b, 0x9a, 0xd8, 0x16, 0xce, 0x36, - 0xb1, 0x6d, 0xc4, 0x8b, 0xbe, 0x81, 0x77, 0x8a, 0xec, 0x89, 0xb0, 0x6d, 0xa4, 0x35, 0xe4, 0xfb, - 0xd7, 0xda, 0x5c, 0x01, 0x17, 0x19, 0xd3, 0x00, 0xb6, 0x30, 0xb1, 0x01, 0x6c, 0xa5, 0xdc, 0x17, - 0xd0, 0x29, 0x51, 0x9e, 0x51, 0x0d, 0x1b, 0xc9, 0x1a, 0xd5, 0xb0, 0xb2, 0x26, 0xc7, 0x2e, 0x31, - 0x9f, 0x81, 0x6d, 0xe3, 0x54, 0x03, 0xdb, 0x4a, 0x9e, 0xe8, 0xeb, 0xfc, 0xff, 0x8b, 0x98, 0x8f, - 0xf7, 0xed, 0xb9, 0x16, 0xa7, 0x03, 0x5f, 0x67, 0xa2, 0x50, 0x9f, 0x41, 0x43, 0x92, 0x27, 0xba, - 0xab, 0x59, 0x97, 0x48, 0x76, 0xf0, 0xde, 0x92, 0xaf, 0x12, 0x66, 0xe2, 0x1c, 0xdc, 0x7d, 0x7d, - 0x39, 0xbc, 0xf5, 0xe7, 0xe5, 0xf0, 0xd6, 0x3f, 0x97, 0x43, 0xe7, 0xd7, 0xc5, 0xd0, 0x79, 0xbd, - 0x18, 0x3a, 0x6f, 0x16, 0x43, 0xe7, 0xef, 0xc5, 0xd0, 0xf9, 0xa1, 0x21, 0xfe, 0xbb, 0x7e, 0xfc, - 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf8, 0x2e, 0x27, 0x11, 0xf7, 0x0e, 0x00, 0x00, + // 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, } diff --git a/api/execution.proto b/api/execution/execution.proto similarity index 100% rename from api/execution.proto rename to api/execution/execution.proto diff --git a/api/execution/gen.go b/api/execution/gen.go new file mode 100644 index 0000000..7347a67 --- /dev/null +++ b/api/execution/gen.go @@ -0,0 +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 diff --git a/api/registry/gen.go b/api/registry/gen.go new file mode 100644 index 0000000..49288c8 --- /dev/null +++ b/api/registry/gen.go @@ -0,0 +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 diff --git a/api/registry.pb.go b/api/registry/registry.pb.go similarity index 93% rename from api/registry.pb.go rename to api/registry/registry.pb.go index 30dc774..01a5a99 100644 --- a/api/registry.pb.go +++ b/api/registry/registry.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. -// source: api/registry.proto +// source: registry.proto // DO NOT EDIT! /* - Package api is a generated protocol buffer package. + Package registry is a generated protocol buffer package. It is generated from these files: - api/registry.proto + registry.proto It has these top-level messages: PullRequest @@ -22,7 +22,7 @@ Layer Authentication */ -package api +package registry import proto "github.com/gogo/protobuf/proto" import fmt "fmt" @@ -165,7 +165,7 @@ func (this *PullRequest) GoString() string { return "nil" } s := make([]string, 0, 6) - s = append(s, "&api.PullRequest{") + s = append(s, "®istry.PullRequest{") s = append(s, "Uri: "+fmt.Sprintf("%#v", this.Uri)+",\n") if this.Auth != nil { s = append(s, "Auth: "+fmt.Sprintf("%#v", this.Auth)+",\n") @@ -178,7 +178,7 @@ func (this *PullResponse) GoString() string { return "nil" } s := make([]string, 0, 6) - s = append(s, "&api.PullResponse{") + s = append(s, "®istry.PullResponse{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") if this.Layers != nil { s = append(s, "Layers: "+fmt.Sprintf("%#v", this.Layers)+",\n") @@ -191,7 +191,7 @@ func (this *PushRequest) GoString() string { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.PushRequest{") + s = append(s, "®istry.PushRequest{") s = append(s, "}") return strings.Join(s, "") } @@ -200,7 +200,7 @@ func (this *PushResponse) GoString() string { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.PushResponse{") + s = append(s, "®istry.PushResponse{") s = append(s, "}") return strings.Join(s, "") } @@ -209,7 +209,7 @@ func (this *StatusRequest) GoString() string { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.StatusRequest{") + s = append(s, "®istry.StatusRequest{") s = append(s, "}") return strings.Join(s, "") } @@ -218,7 +218,7 @@ func (this *StatusResponse) GoString() string { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.StatusResponse{") + s = append(s, "®istry.StatusResponse{") s = append(s, "}") return strings.Join(s, "") } @@ -227,7 +227,7 @@ func (this *DeleteRequest) GoString() string { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.DeleteRequest{") + s = append(s, "®istry.DeleteRequest{") s = append(s, "}") return strings.Join(s, "") } @@ -236,7 +236,7 @@ func (this *DeleteResponse) GoString() string { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.DeleteResponse{") + s = append(s, "®istry.DeleteResponse{") s = append(s, "}") return strings.Join(s, "") } @@ -245,7 +245,7 @@ func (this *CancelRequest) GoString() string { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.CancelRequest{") + s = append(s, "®istry.CancelRequest{") s = append(s, "}") return strings.Join(s, "") } @@ -254,7 +254,7 @@ func (this *CancelResponse) GoString() string { return "nil" } s := make([]string, 0, 4) - s = append(s, "&api.CancelResponse{") + s = append(s, "®istry.CancelResponse{") s = append(s, "}") return strings.Join(s, "") } @@ -263,7 +263,7 @@ func (this *Layer) GoString() string { return "nil" } s := make([]string, 0, 6) - s = append(s, "&api.Layer{") + s = append(s, "®istry.Layer{") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "Size_: "+fmt.Sprintf("%#v", this.Size_)+",\n") s = append(s, "}") @@ -274,7 +274,7 @@ func (this *Authentication) GoString() string { return "nil" } s := make([]string, 0, 6) - s = append(s, "&api.Authentication{") + s = append(s, "®istry.Authentication{") s = append(s, "Username: "+fmt.Sprintf("%#v", this.Username)+",\n") s = append(s, "Password: "+fmt.Sprintf("%#v", this.Password)+",\n") s = append(s, "}") @@ -546,7 +546,7 @@ var _Registry_serviceDesc = grpc.ServiceDesc{ ServerStreams: true, }, }, - Metadata: "api/registry.proto", + Metadata: "registry.proto", } func (m *PullRequest) Marshal() (dAtA []byte, err error) { @@ -2024,35 +2024,35 @@ var ( ErrIntOverflowRegistry = fmt.Errorf("proto: integer overflow") ) -func init() { proto.RegisterFile("api/registry.proto", fileDescriptorRegistry) } +func init() { proto.RegisterFile("registry.proto", fileDescriptorRegistry) } var fileDescriptorRegistry = []byte{ - // 427 bytes of a gzipped FileDescriptorProto + // 424 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x93, 0x4f, 0x8e, 0xd3, 0x30, - 0x14, 0xc6, 0xc7, 0x99, 0x10, 0xcd, 0xbc, 0xd2, 0x32, 0xb2, 0x46, 0xa8, 0x0a, 0x33, 0xa1, 0xca, - 0xaa, 0x0b, 0x94, 0x61, 0x3a, 0x07, 0x40, 0x94, 0x22, 0x40, 0x62, 0x81, 0x0c, 0x17, 0x30, 0x8d, - 0xd5, 0x58, 0x0a, 0x71, 0xb0, 0x1d, 0x50, 0x59, 0x71, 0xbc, 0x2e, 0x59, 0xb2, 0x42, 0x34, 0x5c, - 0x80, 0x23, 0x8c, 0xec, 0x24, 0x6d, 0xd3, 0xb4, 0xbb, 0xf7, 0xe7, 0xd3, 0xcf, 0x2f, 0xdf, 0xa7, - 0x00, 0xa6, 0x39, 0xbf, 0x91, 0x6c, 0xc1, 0x95, 0x96, 0xcb, 0x28, 0x97, 0x42, 0x0b, 0xdc, 0x9f, - 0x8b, 0x4c, 0x53, 0x9e, 0x31, 0x19, 0x47, 0xdf, 0x6e, 0xfd, 0xcb, 0x85, 0x58, 0x08, 0xbb, 0xb9, - 0x31, 0x55, 0x25, 0x0a, 0x09, 0xf4, 0x3e, 0x14, 0x69, 0x4a, 0xd8, 0xd7, 0x82, 0x29, 0x8d, 0x2f, - 0xe0, 0xb4, 0x90, 0x7c, 0x88, 0x46, 0x68, 0x7c, 0x4e, 0x4c, 0x89, 0x6f, 0xc1, 0xa5, 0x85, 0x4e, - 0x86, 0xce, 0x08, 0x8d, 0x7b, 0x93, 0xeb, 0xa8, 0x05, 0x8d, 0x5e, 0x16, 0x3a, 0x61, 0x99, 0xe6, - 0x73, 0xaa, 0xb9, 0xc8, 0x88, 0x95, 0x86, 0x9f, 0xe0, 0x61, 0xc5, 0x54, 0xb9, 0xc8, 0x14, 0xc3, - 0x8f, 0xc1, 0xe1, 0x71, 0xc5, 0x9c, 0x7a, 0xe5, 0x9f, 0xa7, 0xce, 0xbb, 0x19, 0x71, 0x78, 0x8c, - 0x9f, 0x81, 0x97, 0xd2, 0x25, 0x93, 0x6a, 0xe8, 0x8c, 0x4e, 0xc7, 0xbd, 0xc9, 0xe5, 0x1e, 0xfc, - 0xbd, 0x59, 0x92, 0x5a, 0x13, 0xf6, 0xcd, 0xa5, 0x2a, 0xa9, 0x2f, 0x0d, 0x07, 0xe6, 0x11, 0xd3, - 0x56, 0x8f, 0x84, 0x8f, 0xa0, 0xff, 0x51, 0x53, 0x5d, 0xa8, 0x46, 0x70, 0x01, 0x83, 0x66, 0xb0, - 0x95, 0xcc, 0x58, 0xca, 0x34, 0xdb, 0x91, 0x34, 0x83, 0xad, 0xe4, 0x15, 0xcd, 0xe6, 0x2c, 0xdd, - 0x91, 0x34, 0x83, 0x5a, 0x72, 0x07, 0x0f, 0xec, 0x61, 0x47, 0x3f, 0x0b, 0x83, 0xab, 0xf8, 0x0f, - 0x66, 0x1d, 0x73, 0x89, 0xad, 0xc3, 0xb7, 0x30, 0x68, 0x5b, 0x85, 0x7d, 0x38, 0x2b, 0x14, 0x93, - 0x19, 0xfd, 0xc2, 0x6a, 0xbb, 0x37, 0xbd, 0xd9, 0xe5, 0x54, 0xa9, 0xef, 0x42, 0xc6, 0x96, 0x72, - 0x4e, 0x36, 0xfd, 0xe4, 0x9f, 0x03, 0x67, 0xa4, 0x0e, 0x1a, 0xbf, 0x00, 0xd7, 0x38, 0x8d, 0xfd, - 0x3d, 0xe7, 0x76, 0x22, 0xf5, 0x9f, 0x1c, 0xdc, 0xd5, 0xd1, 0x58, 0x80, 0x4a, 0x0e, 0x00, 0x36, - 0x4e, 0x1f, 0x00, 0x6c, 0x6d, 0xc7, 0xaf, 0xc1, 0xab, 0x2c, 0xc4, 0x57, 0x7b, 0xb2, 0x96, 0xd5, - 0xfe, 0xf5, 0x91, 0x6d, 0x8d, 0x79, 0x03, 0x5e, 0x15, 0x56, 0x07, 0xd3, 0x0a, 0xb5, 0x83, 0x69, - 0x27, 0xfc, 0x1c, 0x99, 0x7b, 0xaa, 0xbc, 0x3a, 0xa0, 0x56, 0xae, 0x1d, 0x50, 0x3b, 0xe4, 0xe9, - 0xd5, 0x6a, 0x1d, 0x9c, 0xfc, 0x5e, 0x07, 0x27, 0xff, 0xd7, 0x01, 0xfa, 0x59, 0x06, 0x68, 0x55, - 0x06, 0xe8, 0x57, 0x19, 0xa0, 0xbf, 0x65, 0x80, 0x3e, 0x7b, 0xf6, 0xdf, 0xb9, 0xbb, 0x0f, 0x00, - 0x00, 0xff, 0xff, 0x43, 0xb4, 0x28, 0x72, 0x76, 0x03, 0x00, 0x00, + 0x14, 0xc6, 0xc7, 0x99, 0x10, 0xcd, 0xbc, 0xd2, 0x30, 0xb2, 0x46, 0xa8, 0x0a, 0x33, 0xa1, 0xca, + 0xaa, 0x0b, 0x14, 0x98, 0xf6, 0x00, 0x88, 0x52, 0x04, 0x48, 0x2c, 0x90, 0xe1, 0x02, 0xa6, 0xb1, + 0x1a, 0x4b, 0x21, 0x2e, 0xb6, 0x03, 0x2a, 0x2b, 0x8e, 0xd7, 0x25, 0x4b, 0x56, 0x88, 0x86, 0x0b, + 0x70, 0x04, 0x64, 0x27, 0x69, 0x9b, 0xa6, 0xdd, 0xbd, 0x3f, 0x9f, 0x7e, 0x7e, 0xf9, 0x3e, 0x05, + 0x7c, 0xc9, 0x16, 0x5c, 0x69, 0xb9, 0x8a, 0x97, 0x52, 0x68, 0x81, 0xfb, 0x73, 0x91, 0x6b, 0xca, + 0x73, 0x26, 0x93, 0xf8, 0xeb, 0x5d, 0x70, 0xbd, 0x10, 0x0b, 0x61, 0x37, 0x4f, 0x4d, 0x55, 0x89, + 0x22, 0x02, 0xbd, 0xf7, 0x45, 0x96, 0x11, 0xf6, 0xa5, 0x60, 0x4a, 0xe3, 0x2b, 0x38, 0x2f, 0x24, + 0x1f, 0xa0, 0x21, 0x1a, 0x5d, 0x12, 0x53, 0xe2, 0x3b, 0x70, 0x69, 0xa1, 0xd3, 0x81, 0x33, 0x44, + 0xa3, 0xde, 0xf8, 0x36, 0x6e, 0x41, 0xe3, 0x17, 0x85, 0x4e, 0x59, 0xae, 0xf9, 0x9c, 0x6a, 0x2e, + 0x72, 0x62, 0xa5, 0xd1, 0x47, 0xb8, 0x5f, 0x31, 0xd5, 0x52, 0xe4, 0x8a, 0xe1, 0x87, 0xe0, 0xf0, + 0xa4, 0x62, 0x4e, 0xbd, 0xf2, 0xf7, 0x63, 0xe7, 0xed, 0x8c, 0x38, 0x3c, 0xc1, 0x4f, 0xc0, 0xcb, + 0xe8, 0x8a, 0x49, 0x35, 0x70, 0x86, 0xe7, 0xa3, 0xde, 0xf8, 0xfa, 0x00, 0xfe, 0xce, 0x2c, 0x49, + 0xad, 0x89, 0xfa, 0xe6, 0x52, 0x95, 0xd6, 0x97, 0x46, 0xbe, 0x79, 0xc4, 0xb4, 0xd5, 0x23, 0xd1, + 0x03, 0xe8, 0x7f, 0xd0, 0x54, 0x17, 0xaa, 0x11, 0x5c, 0x81, 0xdf, 0x0c, 0x76, 0x92, 0x19, 0xcb, + 0x98, 0x66, 0x7b, 0x92, 0x66, 0xb0, 0x93, 0xbc, 0xa4, 0xf9, 0x9c, 0x65, 0x7b, 0x92, 0x66, 0x50, + 0x4b, 0x26, 0x70, 0xcf, 0x1e, 0x76, 0xf2, 0xb3, 0x30, 0xb8, 0x8a, 0x7f, 0x67, 0xd6, 0x31, 0x97, + 0xd8, 0x3a, 0x7a, 0x03, 0x7e, 0xdb, 0x2a, 0x1c, 0xc0, 0x45, 0xa1, 0x98, 0xcc, 0xe9, 0x67, 0x56, + 0xdb, 0xbd, 0xed, 0xcd, 0x6e, 0x49, 0x95, 0xfa, 0x26, 0x64, 0x62, 0x29, 0x97, 0x64, 0xdb, 0x8f, + 0xff, 0x3a, 0x70, 0x41, 0xea, 0xa0, 0xf1, 0x73, 0x70, 0x8d, 0xd3, 0x38, 0x38, 0x70, 0x6e, 0x2f, + 0xd2, 0xe0, 0xd1, 0xd1, 0x5d, 0x1d, 0x8d, 0x05, 0xa8, 0xf4, 0x08, 0x60, 0xeb, 0xf4, 0x11, 0xc0, + 0xce, 0x76, 0xfc, 0x0a, 0xbc, 0xca, 0x42, 0x7c, 0x73, 0x20, 0x6b, 0x59, 0x1d, 0xdc, 0x9e, 0xd8, + 0xd6, 0x98, 0xd7, 0xe0, 0x55, 0x61, 0x75, 0x30, 0xad, 0x50, 0x3b, 0x98, 0x76, 0xc2, 0xcf, 0x90, + 0xb9, 0xa7, 0xca, 0xab, 0x03, 0x6a, 0xe5, 0xda, 0x01, 0xb5, 0x43, 0x9e, 0xde, 0xac, 0x37, 0xe1, + 0xd9, 0xaf, 0x4d, 0x78, 0xf6, 0x6f, 0x13, 0xa2, 0x1f, 0x65, 0x88, 0xd6, 0x65, 0x88, 0x7e, 0x96, + 0x21, 0xfa, 0x53, 0x86, 0xe8, 0x93, 0x67, 0xff, 0x9d, 0xc9, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x1d, 0xe2, 0x86, 0x58, 0x72, 0x03, 0x00, 0x00, } diff --git a/api/registry.proto b/api/registry/registry.proto similarity index 100% rename from api/registry.proto rename to api/registry/registry.proto