vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Revert "proto: move all protos under a single root"

Browse source 
This reverts commit 352c6b590c.
This commit is contained in:
Kenfe-Mickael Laventure 2016-12-01 14:25:03 -08:00
parent 352c6b590c
commit ef03000b27
7 changed files with 531 additions and 536 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -22,8 +22,6 @@ BINARIES=$(addprefix bin/,$(COMMANDS))
# time. # time.
GO_LDFLAGS=-ldflags "-X `go list`.Version=$(VERSION)" 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 .PHONY: clean all AUTHORS fmt vet lint build binaries test integration setup generate checkprotos coverage ci check help install uninstall
.DEFAULT: default .DEFAULT: default
@ -48,10 +46,7 @@ setup: ## install dependencies
generate: bin/protoc-gen-gogoctrd ## generate protobuf generate: bin/protoc-gen-gogoctrd ## generate protobuf
@echo "🐳 $@" @echo "🐳 $@"
@for p in $(PROTOS) ; do \ @PATH=${ROOTDIR}/bin:${PATH} go generate -x ${PACKAGES}
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
checkprotos: generate ## check if protobufs needs to be generated again checkprotos: generate ## check if protobufs needs to be generated again
@echo "🐳 $@" @echo "🐳 $@"
@ -138,3 +133,4 @@ coverage-integration: ## generate coverprofiles from the integration tests
help: ## this help help: ## this help
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort @awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort

963
api/execution.pb.go → api/execution/execution.pb.go
View file

File diff suppressed because it is too large Load diff

0
api/execution.proto → api/execution/execution.proto
View file

3
api/execution/gen.go Normal file
View file

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

3
api/registry/gen.go Normal file
View file

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

90
api/registry.pb.go → api/registry/registry.pb.go
View file

@ -1,12 +1,12 @@
// Code generated by protoc-gen-gogo. // Code generated by protoc-gen-gogo.
// source: api/registry.proto // source: registry.proto
// DO NOT EDIT! // 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: It is generated from these files:
api/registry.proto registry.proto
It has these top-level messages: It has these top-level messages:
PullRequest PullRequest
@ -22,7 +22,7 @@
Layer Layer
Authentication Authentication
*/ */
package api package registry
import proto "github.com/gogo/protobuf/proto" import proto "github.com/gogo/protobuf/proto"
import fmt "fmt" import fmt "fmt"
@ -165,7 +165,7 @@ func (this *PullRequest) GoString() string {
return "nil" return "nil"
} }
s := make([]string, 0, 6) s := make([]string, 0, 6)
s = append(s, "&api.PullRequest{") s = append(s, "&registry.PullRequest{")
s = append(s, "Uri: "+fmt.Sprintf("%#v", this.Uri)+",\n") s = append(s, "Uri: "+fmt.Sprintf("%#v", this.Uri)+",\n")
if this.Auth != nil { if this.Auth != nil {
s = append(s, "Auth: "+fmt.Sprintf("%#v", this.Auth)+",\n") s = append(s, "Auth: "+fmt.Sprintf("%#v", this.Auth)+",\n")
@ -178,7 +178,7 @@ func (this *PullResponse) GoString() string {
return "nil" return "nil"
} }
s := make([]string, 0, 6) s := make([]string, 0, 6)
s = append(s, "&api.PullResponse{") s = append(s, "&registry.PullResponse{")
s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n")
if this.Layers != nil { if this.Layers != nil {
s = append(s, "Layers: "+fmt.Sprintf("%#v", this.Layers)+",\n") s = append(s, "Layers: "+fmt.Sprintf("%#v", this.Layers)+",\n")
@ -191,7 +191,7 @@ func (this *PushRequest) GoString() string {
return "nil" return "nil"
} }
s := make([]string, 0, 4) s := make([]string, 0, 4)
s = append(s, "&api.PushRequest{") s = append(s, "&registry.PushRequest{")
s = append(s, "}") s = append(s, "}")
return strings.Join(s, "") return strings.Join(s, "")
} }
@ -200,7 +200,7 @@ func (this *PushResponse) GoString() string {
return "nil" return "nil"
} }
s := make([]string, 0, 4) s := make([]string, 0, 4)
s = append(s, "&api.PushResponse{") s = append(s, "&registry.PushResponse{")
s = append(s, "}") s = append(s, "}")
return strings.Join(s, "") return strings.Join(s, "")
} }
@ -209,7 +209,7 @@ func (this *StatusRequest) GoString() string {
return "nil" return "nil"
} }
s := make([]string, 0, 4) s := make([]string, 0, 4)
s = append(s, "&api.StatusRequest{") s = append(s, "&registry.StatusRequest{")
s = append(s, "}") s = append(s, "}")
return strings.Join(s, "") return strings.Join(s, "")
} }
@ -218,7 +218,7 @@ func (this *StatusResponse) GoString() string {
return "nil" return "nil"
} }
s := make([]string, 0, 4) s := make([]string, 0, 4)
s = append(s, "&api.StatusResponse{") s = append(s, "&registry.StatusResponse{")
s = append(s, "}") s = append(s, "}")
return strings.Join(s, "") return strings.Join(s, "")
} }
@ -227,7 +227,7 @@ func (this *DeleteRequest) GoString() string {
return "nil" return "nil"
} }
s := make([]string, 0, 4) s := make([]string, 0, 4)
s = append(s, "&api.DeleteRequest{") s = append(s, "&registry.DeleteRequest{")
s = append(s, "}") s = append(s, "}")
return strings.Join(s, "") return strings.Join(s, "")
} }
@ -236,7 +236,7 @@ func (this *DeleteResponse) GoString() string {
return "nil" return "nil"
} }
s := make([]string, 0, 4) s := make([]string, 0, 4)
s = append(s, "&api.DeleteResponse{") s = append(s, "&registry.DeleteResponse{")
s = append(s, "}") s = append(s, "}")
return strings.Join(s, "") return strings.Join(s, "")
} }
@ -245,7 +245,7 @@ func (this *CancelRequest) GoString() string {
return "nil" return "nil"
} }
s := make([]string, 0, 4) s := make([]string, 0, 4)
s = append(s, "&api.CancelRequest{") s = append(s, "&registry.CancelRequest{")
s = append(s, "}") s = append(s, "}")
return strings.Join(s, "") return strings.Join(s, "")
} }
@ -254,7 +254,7 @@ func (this *CancelResponse) GoString() string {
return "nil" return "nil"
} }
s := make([]string, 0, 4) s := make([]string, 0, 4)
s = append(s, "&api.CancelResponse{") s = append(s, "&registry.CancelResponse{")
s = append(s, "}") s = append(s, "}")
return strings.Join(s, "") return strings.Join(s, "")
} }
@ -263,7 +263,7 @@ func (this *Layer) GoString() string {
return "nil" return "nil"
} }
s := make([]string, 0, 6) s := make([]string, 0, 6)
s = append(s, "&api.Layer{") s = append(s, "&registry.Layer{")
s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n") s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n")
s = append(s, "Size_: "+fmt.Sprintf("%#v", this.Size_)+",\n") s = append(s, "Size_: "+fmt.Sprintf("%#v", this.Size_)+",\n")
s = append(s, "}") s = append(s, "}")
@ -274,7 +274,7 @@ func (this *Authentication) GoString() string {
return "nil" return "nil"
} }
s := make([]string, 0, 6) s := make([]string, 0, 6)
s = append(s, "&api.Authentication{") s = append(s, "&registry.Authentication{")
s = append(s, "Username: "+fmt.Sprintf("%#v", this.Username)+",\n") s = append(s, "Username: "+fmt.Sprintf("%#v", this.Username)+",\n")
s = append(s, "Password: "+fmt.Sprintf("%#v", this.Password)+",\n") s = append(s, "Password: "+fmt.Sprintf("%#v", this.Password)+",\n")
s = append(s, "}") s = append(s, "}")
@ -546,7 +546,7 @@ var _Registry_serviceDesc = grpc.ServiceDesc{
ServerStreams: true, ServerStreams: true,
}, },
}, },
Metadata: "api/registry.proto", Metadata: "registry.proto",
} }
func (m *PullRequest) Marshal() (dAtA []byte, err error) { func (m *PullRequest) Marshal() (dAtA []byte, err error) {
@ -2024,35 +2024,35 @@ var (
ErrIntOverflowRegistry = fmt.Errorf("proto: integer overflow") ErrIntOverflowRegistry = fmt.Errorf("proto: integer overflow")
) )
func init() { proto.RegisterFile("api/registry.proto", fileDescriptorRegistry) } func init() { proto.RegisterFile("registry.proto", fileDescriptorRegistry) }
var fileDescriptorRegistry = []byte{ 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, 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, 0x14, 0xc6, 0xc7, 0x99, 0x10, 0xcd, 0xbc, 0xd2, 0x30, 0xb2, 0x46, 0xa8, 0x0a, 0x33, 0xa1, 0xca,
0xaa, 0x0b, 0x94, 0x61, 0x3a, 0x07, 0x40, 0x94, 0x22, 0x40, 0x62, 0x81, 0x0c, 0x17, 0x30, 0x8d, 0xaa, 0x0b, 0x14, 0x98, 0xf6, 0x00, 0x88, 0x52, 0x04, 0x48, 0x2c, 0x90, 0xe1, 0x02, 0xa6, 0xb1,
0xd5, 0x58, 0x0a, 0x71, 0xb0, 0x1d, 0x50, 0x59, 0x71, 0xbc, 0x2e, 0x59, 0xb2, 0x42, 0x34, 0x5c, 0x1a, 0x4b, 0x21, 0x2e, 0xb6, 0x03, 0x2a, 0x2b, 0x8e, 0xd7, 0x25, 0x4b, 0x56, 0x88, 0x86, 0x0b,
0x80, 0x23, 0x8c, 0xec, 0x24, 0x6d, 0xd3, 0xb4, 0xbb, 0xf7, 0xe7, 0xd3, 0xcf, 0x2f, 0xdf, 0xa7, 0x70, 0x04, 0x64, 0x27, 0x69, 0x9b, 0xa6, 0xdd, 0xbd, 0x3f, 0x9f, 0x7e, 0x7e, 0xf9, 0x3e, 0x05,
0x00, 0xa6, 0x39, 0xbf, 0x91, 0x6c, 0xc1, 0x95, 0x96, 0xcb, 0x28, 0x97, 0x42, 0x0b, 0xdc, 0x9f, 0x7c, 0xc9, 0x16, 0x5c, 0x69, 0xb9, 0x8a, 0x97, 0x52, 0x68, 0x81, 0xfb, 0x73, 0x91, 0x6b, 0xca,
0x8b, 0x4c, 0x53, 0x9e, 0x31, 0x19, 0x47, 0xdf, 0x6e, 0xfd, 0xcb, 0x85, 0x58, 0x08, 0xbb, 0xb9, 0x73, 0x26, 0x93, 0xf8, 0xeb, 0x5d, 0x70, 0xbd, 0x10, 0x0b, 0x61, 0x37, 0x4f, 0x4d, 0x55, 0x89,
0x31, 0x55, 0x25, 0x0a, 0x09, 0xf4, 0x3e, 0x14, 0x69, 0x4a, 0xd8, 0xd7, 0x82, 0x29, 0x8d, 0x2f, 0x22, 0x02, 0xbd, 0xf7, 0x45, 0x96, 0x11, 0xf6, 0xa5, 0x60, 0x4a, 0xe3, 0x2b, 0x38, 0x2f, 0x24,
0xe0, 0xb4, 0x90, 0x7c, 0x88, 0x46, 0x68, 0x7c, 0x4e, 0x4c, 0x89, 0x6f, 0xc1, 0xa5, 0x85, 0x4e, 0x1f, 0xa0, 0x21, 0x1a, 0x5d, 0x12, 0x53, 0xe2, 0x3b, 0x70, 0x69, 0xa1, 0xd3, 0x81, 0x33, 0x44,
0x86, 0xce, 0x08, 0x8d, 0x7b, 0x93, 0xeb, 0xa8, 0x05, 0x8d, 0x5e, 0x16, 0x3a, 0x61, 0x99, 0xe6, 0xa3, 0xde, 0xf8, 0x36, 0x6e, 0x41, 0xe3, 0x17, 0x85, 0x4e, 0x59, 0xae, 0xf9, 0x9c, 0x6a, 0x2e,
0x73, 0xaa, 0xb9, 0xc8, 0x88, 0x95, 0x86, 0x9f, 0xe0, 0x61, 0xc5, 0x54, 0xb9, 0xc8, 0x14, 0xc3, 0x72, 0x62, 0xa5, 0xd1, 0x47, 0xb8, 0x5f, 0x31, 0xd5, 0x52, 0xe4, 0x8a, 0xe1, 0x87, 0xe0, 0xf0,
0x8f, 0xc1, 0xe1, 0x71, 0xc5, 0x9c, 0x7a, 0xe5, 0x9f, 0xa7, 0xce, 0xbb, 0x19, 0x71, 0x78, 0x8c, 0xa4, 0x62, 0x4e, 0xbd, 0xf2, 0xf7, 0x63, 0xe7, 0xed, 0x8c, 0x38, 0x3c, 0xc1, 0x4f, 0xc0, 0xcb,
0x9f, 0x81, 0x97, 0xd2, 0x25, 0x93, 0x6a, 0xe8, 0x8c, 0x4e, 0xc7, 0xbd, 0xc9, 0xe5, 0x1e, 0xfc, 0xe8, 0x8a, 0x49, 0x35, 0x70, 0x86, 0xe7, 0xa3, 0xde, 0xf8, 0xfa, 0x00, 0xfe, 0xce, 0x2c, 0x49,
0xbd, 0x59, 0x92, 0x5a, 0x13, 0xf6, 0xcd, 0xa5, 0x2a, 0xa9, 0x2f, 0x0d, 0x07, 0xe6, 0x11, 0xd3, 0xad, 0x89, 0xfa, 0xe6, 0x52, 0x95, 0xd6, 0x97, 0x46, 0xbe, 0x79, 0xc4, 0xb4, 0xd5, 0x23, 0xd1,
0x56, 0x8f, 0x84, 0x8f, 0xa0, 0xff, 0x51, 0x53, 0x5d, 0xa8, 0x46, 0x70, 0x01, 0x83, 0x66, 0xb0, 0x03, 0xe8, 0x7f, 0xd0, 0x54, 0x17, 0xaa, 0x11, 0x5c, 0x81, 0xdf, 0x0c, 0x76, 0x92, 0x19, 0xcb,
0x95, 0xcc, 0x58, 0xca, 0x34, 0xdb, 0x91, 0x34, 0x83, 0xad, 0xe4, 0x15, 0xcd, 0xe6, 0x2c, 0xdd, 0x98, 0x66, 0x7b, 0x92, 0x66, 0xb0, 0x93, 0xbc, 0xa4, 0xf9, 0x9c, 0x65, 0x7b, 0x92, 0x66, 0x50,
0x91, 0x34, 0x83, 0x5a, 0x72, 0x07, 0x0f, 0xec, 0x61, 0x47, 0x3f, 0x0b, 0x83, 0xab, 0xf8, 0x0f, 0x4b, 0x26, 0x70, 0xcf, 0x1e, 0x76, 0xf2, 0xb3, 0x30, 0xb8, 0x8a, 0x7f, 0x67, 0xd6, 0x31, 0x97,
0x66, 0x1d, 0x73, 0x89, 0xad, 0xc3, 0xb7, 0x30, 0x68, 0x5b, 0x85, 0x7d, 0x38, 0x2b, 0x14, 0x93, 0xd8, 0x3a, 0x7a, 0x03, 0x7e, 0xdb, 0x2a, 0x1c, 0xc0, 0x45, 0xa1, 0x98, 0xcc, 0xe9, 0x67, 0x56,
0x19, 0xfd, 0xc2, 0x6a, 0xbb, 0x37, 0xbd, 0xd9, 0xe5, 0x54, 0xa9, 0xef, 0x42, 0xc6, 0x96, 0x72, 0xdb, 0xbd, 0xed, 0xcd, 0x6e, 0x49, 0x95, 0xfa, 0x26, 0x64, 0x62, 0x29, 0x97, 0x64, 0xdb, 0x8f,
0x4e, 0x36, 0xfd, 0xe4, 0x9f, 0x03, 0x67, 0xa4, 0x0e, 0x1a, 0xbf, 0x00, 0xd7, 0x38, 0x8d, 0xfd, 0xff, 0x3a, 0x70, 0x41, 0xea, 0xa0, 0xf1, 0x73, 0x70, 0x8d, 0xd3, 0x38, 0x38, 0x70, 0x6e, 0x2f,
0x3d, 0xe7, 0x76, 0x22, 0xf5, 0x9f, 0x1c, 0xdc, 0xd5, 0xd1, 0x58, 0x80, 0x4a, 0x0e, 0x00, 0x36, 0xd2, 0xe0, 0xd1, 0xd1, 0x5d, 0x1d, 0x8d, 0x05, 0xa8, 0xf4, 0x08, 0x60, 0xeb, 0xf4, 0x11, 0xc0,
0x4e, 0x1f, 0x00, 0x6c, 0x6d, 0xc7, 0xaf, 0xc1, 0xab, 0x2c, 0xc4, 0x57, 0x7b, 0xb2, 0x96, 0xd5, 0xce, 0x76, 0xfc, 0x0a, 0xbc, 0xca, 0x42, 0x7c, 0x73, 0x20, 0x6b, 0x59, 0x1d, 0xdc, 0x9e, 0xd8,
0xfe, 0xf5, 0x91, 0x6d, 0x8d, 0x79, 0x03, 0x5e, 0x15, 0x56, 0x07, 0xd3, 0x0a, 0xb5, 0x83, 0x69, 0xd6, 0x98, 0xd7, 0xe0, 0x55, 0x61, 0x75, 0x30, 0xad, 0x50, 0x3b, 0x98, 0x76, 0xc2, 0xcf, 0x90,
0x27, 0xfc, 0x1c, 0x99, 0x7b, 0xaa, 0xbc, 0x3a, 0xa0, 0x56, 0xae, 0x1d, 0x50, 0x3b, 0xe4, 0xe9, 0xb9, 0xa7, 0xca, 0xab, 0x03, 0x6a, 0xe5, 0xda, 0x01, 0xb5, 0x43, 0x9e, 0xde, 0xac, 0x37, 0xe1,
0xd5, 0x6a, 0x1d, 0x9c, 0xfc, 0x5e, 0x07, 0x27, 0xff, 0xd7, 0x01, 0xfa, 0x59, 0x06, 0x68, 0x55, 0xd9, 0xaf, 0x4d, 0x78, 0xf6, 0x6f, 0x13, 0xa2, 0x1f, 0x65, 0x88, 0xd6, 0x65, 0x88, 0x7e, 0x96,
0x06, 0xe8, 0x57, 0x19, 0xa0, 0xbf, 0x65, 0x80, 0x3e, 0x7b, 0xf6, 0xdf, 0xb9, 0xbb, 0x0f, 0x00, 0x21, 0xfa, 0x53, 0x86, 0xe8, 0x93, 0x67, 0xff, 0x9d, 0xc9, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff,
0x00, 0xff, 0xff, 0x43, 0xb4, 0x28, 0x72, 0x76, 0x03, 0x00, 0x00, 0x1d, 0xe2, 0x86, 0x58, 0x72, 0x03, 0x00, 0x00,
} }

0
api/registry.proto → api/registry/registry.proto
View file