diff --git a/cli/cmd/serve.go b/cli/cmd/serve.go index 53e884fe7..6058ac174 100644 --- a/cli/cmd/serve.go +++ b/cli/cmd/serve.go @@ -5,14 +5,12 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" + "github.com/spf13/cobra" - "github.com/docker/api/context/store" - cliv1 "github.com/docker/api/protos/cli/v1" containersv1 "github.com/docker/api/protos/containers/v1" + contextsv1 "github.com/docker/api/protos/contexts/v1" "github.com/docker/api/server" "github.com/docker/api/server/proxy" - - "github.com/spf13/cobra" ) type serveOpts struct { @@ -47,9 +45,10 @@ func runServe(ctx context.Context, opts serveOpts) error { defer listener.Close() p := proxy.NewContainerAPI() + contextsService := server.NewContexts() containersv1.RegisterContainersServer(s, p) - cliv1.RegisterCliServer(s, &cliServer{}) + contextsv1.RegisterContextsServer(s, contextsService) go func() { <-ctx.Done() @@ -62,23 +61,3 @@ func runServe(ctx context.Context, opts serveOpts) error { // start the GRPC server to serve on the listener return s.Serve(listener) } - -type cliServer struct { -} - -func (cs *cliServer) Contexts(ctx context.Context, request *cliv1.ContextsRequest) (*cliv1.ContextsResponse, error) { - s := store.ContextStore(ctx) - contexts, err := s.List() - if err != nil { - logrus.Error(err) - return &cliv1.ContextsResponse{}, err - } - result := &cliv1.ContextsResponse{} - for _, c := range contexts { - result.Contexts = append(result.Contexts, &cliv1.Context{ - Name: c.Name, - ContextType: c.Type, - }) - } - return result, nil -} diff --git a/protos/cli/v1/cli.pb.go b/protos/cli/v1/cli.pb.go deleted file mode 100644 index be887a9c9..000000000 --- a/protos/cli/v1/cli.pb.go +++ /dev/null @@ -1,400 +0,0 @@ -// -//Copyright (c) 2020 Docker Inc. -// -//Permission is hereby granted, free of charge, to any person -//obtaining a copy of this software and associated documentation -//files (the "Software"), to deal in the Software without -//restriction, including without limitation the rights to use, copy, -//modify, merge, publish, distribute, sublicense, and/or sell copies -//of the Software, and to permit persons to whom the Software is -//furnished to do so, subject to the following conditions: -// -//The above copyright notice and this permission notice shall be -//included in all copies or substantial portions of the Software. -// -//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -//EXPRESS OR IMPLIED, -//INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -//IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -//HOLDERS BE LIABLE FOR ANY CLAIM, -//DAMAGES OR OTHER LIABILITY, -//WHETHER IN AN ACTION OF CONTRACT, -//TORT OR OTHERWISE, -//ARISING FROM, OUT OF OR IN CONNECTION WITH -//THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.22.0 -// protoc v3.11.2 -// source: protos/cli/v1/cli.proto - -package v1 - -import ( - context "context" - proto "github.com/golang/protobuf/proto" - grpc "google.golang.org/grpc" - codes "google.golang.org/grpc/codes" - status "google.golang.org/grpc/status" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - -type Context struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - ContextType string `protobuf:"bytes,2,opt,name=contextType,proto3" json:"contextType,omitempty"` -} - -func (x *Context) Reset() { - *x = Context{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_cli_v1_cli_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *Context) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*Context) ProtoMessage() {} - -func (x *Context) ProtoReflect() protoreflect.Message { - mi := &file_protos_cli_v1_cli_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use Context.ProtoReflect.Descriptor instead. -func (*Context) Descriptor() ([]byte, []int) { - return file_protos_cli_v1_cli_proto_rawDescGZIP(), []int{0} -} - -func (x *Context) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -func (x *Context) GetContextType() string { - if x != nil { - return x.ContextType - } - return "" -} - -type ContextsRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *ContextsRequest) Reset() { - *x = ContextsRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_cli_v1_cli_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ContextsRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ContextsRequest) ProtoMessage() {} - -func (x *ContextsRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_cli_v1_cli_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ContextsRequest.ProtoReflect.Descriptor instead. -func (*ContextsRequest) Descriptor() ([]byte, []int) { - return file_protos_cli_v1_cli_proto_rawDescGZIP(), []int{1} -} - -type ContextsResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Contexts []*Context `protobuf:"bytes,1,rep,name=contexts,proto3" json:"contexts,omitempty"` -} - -func (x *ContextsResponse) Reset() { - *x = ContextsResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_cli_v1_cli_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ContextsResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ContextsResponse) ProtoMessage() {} - -func (x *ContextsResponse) ProtoReflect() protoreflect.Message { - mi := &file_protos_cli_v1_cli_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ContextsResponse.ProtoReflect.Descriptor instead. -func (*ContextsResponse) Descriptor() ([]byte, []int) { - return file_protos_cli_v1_cli_proto_rawDescGZIP(), []int{2} -} - -func (x *ContextsResponse) GetContexts() []*Context { - if x != nil { - return x.Contexts - } - return nil -} - -var File_protos_cli_v1_cli_proto protoreflect.FileDescriptor - -var file_protos_cli_v1_cli_proto_rawDesc = []byte{ - 0x0a, 0x17, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6c, 0x69, 0x2f, 0x76, 0x31, 0x2f, - 0x63, 0x6c, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1c, 0x63, 0x6f, 0x6d, 0x2e, 0x64, - 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, - 0x2e, 0x63, 0x6c, 0x69, 0x2e, 0x76, 0x31, 0x22, 0x3f, 0x0a, 0x07, 0x43, 0x6f, 0x6e, 0x74, 0x65, - 0x78, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, - 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x78, 0x74, 0x54, 0x79, 0x70, 0x65, 0x22, 0x11, 0x0a, 0x0f, 0x43, 0x6f, 0x6e, 0x74, - 0x65, 0x78, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x55, 0x0a, 0x10, 0x43, - 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x41, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x25, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x61, - 0x70, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6c, 0x69, 0x2e, 0x76, 0x31, - 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, - 0x74, 0x73, 0x32, 0x70, 0x0a, 0x03, 0x43, 0x6c, 0x69, 0x12, 0x69, 0x0a, 0x08, 0x43, 0x6f, 0x6e, - 0x74, 0x65, 0x78, 0x74, 0x73, 0x12, 0x2d, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x6f, 0x63, 0x6b, - 0x65, 0x72, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6c, - 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x73, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x6f, 0x63, 0x6b, 0x65, - 0x72, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6c, 0x69, - 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x28, 0x5a, 0x26, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, - 0x6f, 0x6d, 0x2f, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6c, 0x69, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_protos_cli_v1_cli_proto_rawDescOnce sync.Once - file_protos_cli_v1_cli_proto_rawDescData = file_protos_cli_v1_cli_proto_rawDesc -) - -func file_protos_cli_v1_cli_proto_rawDescGZIP() []byte { - file_protos_cli_v1_cli_proto_rawDescOnce.Do(func() { - file_protos_cli_v1_cli_proto_rawDescData = protoimpl.X.CompressGZIP(file_protos_cli_v1_cli_proto_rawDescData) - }) - return file_protos_cli_v1_cli_proto_rawDescData -} - -var file_protos_cli_v1_cli_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_protos_cli_v1_cli_proto_goTypes = []interface{}{ - (*Context)(nil), // 0: com.docker.api.protos.cli.v1.Context - (*ContextsRequest)(nil), // 1: com.docker.api.protos.cli.v1.ContextsRequest - (*ContextsResponse)(nil), // 2: com.docker.api.protos.cli.v1.ContextsResponse -} -var file_protos_cli_v1_cli_proto_depIdxs = []int32{ - 0, // 0: com.docker.api.protos.cli.v1.ContextsResponse.contexts:type_name -> com.docker.api.protos.cli.v1.Context - 1, // 1: com.docker.api.protos.cli.v1.Cli.Contexts:input_type -> com.docker.api.protos.cli.v1.ContextsRequest - 2, // 2: com.docker.api.protos.cli.v1.Cli.Contexts:output_type -> com.docker.api.protos.cli.v1.ContextsResponse - 2, // [2:3] is the sub-list for method output_type - 1, // [1:2] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name -} - -func init() { file_protos_cli_v1_cli_proto_init() } -func file_protos_cli_v1_cli_proto_init() { - if File_protos_cli_v1_cli_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_protos_cli_v1_cli_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Context); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_cli_v1_cli_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ContextsRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_cli_v1_cli_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ContextsResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_protos_cli_v1_cli_proto_rawDesc, - NumEnums: 0, - NumMessages: 3, - NumExtensions: 0, - NumServices: 1, - }, - GoTypes: file_protos_cli_v1_cli_proto_goTypes, - DependencyIndexes: file_protos_cli_v1_cli_proto_depIdxs, - MessageInfos: file_protos_cli_v1_cli_proto_msgTypes, - }.Build() - File_protos_cli_v1_cli_proto = out.File - file_protos_cli_v1_cli_proto_rawDesc = nil - file_protos_cli_v1_cli_proto_goTypes = nil - file_protos_cli_v1_cli_proto_depIdxs = nil -} - -// Reference imports to suppress errors if they are not otherwise used. -var _ context.Context -var _ grpc.ClientConnInterface - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion6 - -// CliClient is the client API for Cli service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type CliClient interface { - // Returns the list of existing contexts - Contexts(ctx context.Context, in *ContextsRequest, opts ...grpc.CallOption) (*ContextsResponse, error) -} - -type cliClient struct { - cc grpc.ClientConnInterface -} - -func NewCliClient(cc grpc.ClientConnInterface) CliClient { - return &cliClient{cc} -} - -func (c *cliClient) Contexts(ctx context.Context, in *ContextsRequest, opts ...grpc.CallOption) (*ContextsResponse, error) { - out := new(ContextsResponse) - err := c.cc.Invoke(ctx, "/com.docker.api.protos.cli.v1.Cli/Contexts", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -// CliServer is the server API for Cli service. -type CliServer interface { - // Returns the list of existing contexts - Contexts(context.Context, *ContextsRequest) (*ContextsResponse, error) -} - -// UnimplementedCliServer can be embedded to have forward compatible implementations. -type UnimplementedCliServer struct { -} - -func (*UnimplementedCliServer) Contexts(context.Context, *ContextsRequest) (*ContextsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Contexts not implemented") -} - -func RegisterCliServer(s *grpc.Server, srv CliServer) { - s.RegisterService(&_Cli_serviceDesc, srv) -} - -func _Cli_Contexts_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ContextsRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(CliServer).Contexts(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/com.docker.api.protos.cli.v1.Cli/Contexts", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CliServer).Contexts(ctx, req.(*ContextsRequest)) - } - return interceptor(ctx, in, info, handler) -} - -var _Cli_serviceDesc = grpc.ServiceDesc{ - ServiceName: "com.docker.api.protos.cli.v1.Cli", - HandlerType: (*CliServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "Contexts", - Handler: _Cli_Contexts_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "protos/cli/v1/cli.proto", -} diff --git a/protos/contexts/v1/contexts.pb.go b/protos/contexts/v1/contexts.pb.go new file mode 100644 index 000000000..08ba25f67 --- /dev/null +++ b/protos/contexts/v1/contexts.pb.go @@ -0,0 +1,401 @@ +// +//Copyright (c) 2020 Docker Inc. +// +//Permission is hereby granted, free of charge, to any person +//obtaining a copy of this software and associated documentation +//files (the "Software"), to deal in the Software without +//restriction, including without limitation the rights to use, copy, +//modify, merge, publish, distribute, sublicense, and/or sell copies +//of the Software, and to permit persons to whom the Software is +//furnished to do so, subject to the following conditions: +// +//The above copyright notice and this permission notice shall be +//included in all copies or substantial portions of the Software. +// +//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +//EXPRESS OR IMPLIED, +//INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +//IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +//HOLDERS BE LIABLE FOR ANY CLAIM, +//DAMAGES OR OTHER LIABILITY, +//WHETHER IN AN ACTION OF CONTRACT, +//TORT OR OTHERWISE, +//ARISING FROM, OUT OF OR IN CONNECTION WITH +//THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.22.0 +// protoc v3.11.2 +// source: protos/contexts/v1/contexts.proto + +package v1 + +import ( + context "context" + proto "github.com/golang/protobuf/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + +type Context struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + ContextType string `protobuf:"bytes,2,opt,name=contextType,proto3" json:"contextType,omitempty"` +} + +func (x *Context) Reset() { + *x = Context{} + if protoimpl.UnsafeEnabled { + mi := &file_protos_contexts_v1_contexts_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Context) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Context) ProtoMessage() {} + +func (x *Context) ProtoReflect() protoreflect.Message { + mi := &file_protos_contexts_v1_contexts_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Context.ProtoReflect.Descriptor instead. +func (*Context) Descriptor() ([]byte, []int) { + return file_protos_contexts_v1_contexts_proto_rawDescGZIP(), []int{0} +} + +func (x *Context) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *Context) GetContextType() string { + if x != nil { + return x.ContextType + } + return "" +} + +type ListRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *ListRequest) Reset() { + *x = ListRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_protos_contexts_v1_contexts_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ListRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListRequest) ProtoMessage() {} + +func (x *ListRequest) ProtoReflect() protoreflect.Message { + mi := &file_protos_contexts_v1_contexts_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListRequest.ProtoReflect.Descriptor instead. +func (*ListRequest) Descriptor() ([]byte, []int) { + return file_protos_contexts_v1_contexts_proto_rawDescGZIP(), []int{1} +} + +type ListResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Contexts []*Context `protobuf:"bytes,1,rep,name=contexts,proto3" json:"contexts,omitempty"` +} + +func (x *ListResponse) Reset() { + *x = ListResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_protos_contexts_v1_contexts_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ListResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListResponse) ProtoMessage() {} + +func (x *ListResponse) ProtoReflect() protoreflect.Message { + mi := &file_protos_contexts_v1_contexts_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListResponse.ProtoReflect.Descriptor instead. +func (*ListResponse) Descriptor() ([]byte, []int) { + return file_protos_contexts_v1_contexts_proto_rawDescGZIP(), []int{2} +} + +func (x *ListResponse) GetContexts() []*Context { + if x != nil { + return x.Contexts + } + return nil +} + +var File_protos_contexts_v1_contexts_proto protoreflect.FileDescriptor + +var file_protos_contexts_v1_contexts_proto_rawDesc = []byte{ + 0x0a, 0x21, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, + 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x73, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2e, + 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x78, 0x74, 0x2e, 0x76, 0x31, 0x22, 0x3f, 0x0a, 0x07, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, + 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x54, + 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x78, 0x74, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0d, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x55, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x45, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x6f, + 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, + 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x65, + 0x78, 0x74, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x73, 0x32, 0x71, 0x0a, 0x08, + 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x73, 0x12, 0x65, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, + 0x12, 0x2d, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x61, 0x70, + 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, + 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x2e, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, + 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, + 0x2c, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x6f, + 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, + 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_protos_contexts_v1_contexts_proto_rawDescOnce sync.Once + file_protos_contexts_v1_contexts_proto_rawDescData = file_protos_contexts_v1_contexts_proto_rawDesc +) + +func file_protos_contexts_v1_contexts_proto_rawDescGZIP() []byte { + file_protos_contexts_v1_contexts_proto_rawDescOnce.Do(func() { + file_protos_contexts_v1_contexts_proto_rawDescData = protoimpl.X.CompressGZIP(file_protos_contexts_v1_contexts_proto_rawDescData) + }) + return file_protos_contexts_v1_contexts_proto_rawDescData +} + +var file_protos_contexts_v1_contexts_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_protos_contexts_v1_contexts_proto_goTypes = []interface{}{ + (*Context)(nil), // 0: com.docker.api.protos.context.v1.Context + (*ListRequest)(nil), // 1: com.docker.api.protos.context.v1.ListRequest + (*ListResponse)(nil), // 2: com.docker.api.protos.context.v1.ListResponse +} +var file_protos_contexts_v1_contexts_proto_depIdxs = []int32{ + 0, // 0: com.docker.api.protos.context.v1.ListResponse.contexts:type_name -> com.docker.api.protos.context.v1.Context + 1, // 1: com.docker.api.protos.context.v1.Contexts.List:input_type -> com.docker.api.protos.context.v1.ListRequest + 2, // 2: com.docker.api.protos.context.v1.Contexts.List:output_type -> com.docker.api.protos.context.v1.ListResponse + 2, // [2:3] is the sub-list for method output_type + 1, // [1:2] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_protos_contexts_v1_contexts_proto_init() } +func file_protos_contexts_v1_contexts_proto_init() { + if File_protos_contexts_v1_contexts_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_protos_contexts_v1_contexts_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Context); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_protos_contexts_v1_contexts_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ListRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_protos_contexts_v1_contexts_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ListResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_protos_contexts_v1_contexts_proto_rawDesc, + NumEnums: 0, + NumMessages: 3, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_protos_contexts_v1_contexts_proto_goTypes, + DependencyIndexes: file_protos_contexts_v1_contexts_proto_depIdxs, + MessageInfos: file_protos_contexts_v1_contexts_proto_msgTypes, + }.Build() + File_protos_contexts_v1_contexts_proto = out.File + file_protos_contexts_v1_contexts_proto_rawDesc = nil + file_protos_contexts_v1_contexts_proto_goTypes = nil + file_protos_contexts_v1_contexts_proto_depIdxs = nil +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConnInterface + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +const _ = grpc.SupportPackageIsVersion6 + +// ContextsClient is the client API for Contexts service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type ContextsClient interface { + // Returns the list of existing contexts + List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) +} + +type contextsClient struct { + cc grpc.ClientConnInterface +} + +func NewContextsClient(cc grpc.ClientConnInterface) ContextsClient { + return &contextsClient{cc} +} + +func (c *contextsClient) List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) { + out := new(ListResponse) + err := c.cc.Invoke(ctx, "/com.docker.api.protos.context.v1.Contexts/List", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// ContextsServer is the server API for Contexts service. +type ContextsServer interface { + // Returns the list of existing contexts + List(context.Context, *ListRequest) (*ListResponse, error) +} + +// UnimplementedContextsServer can be embedded to have forward compatible implementations. +type UnimplementedContextsServer struct { +} + +func (*UnimplementedContextsServer) List(context.Context, *ListRequest) (*ListResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method List not implemented") +} + +func RegisterContextsServer(s *grpc.Server, srv ContextsServer) { + s.RegisterService(&_Contexts_serviceDesc, srv) +} + +func _Contexts_List_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ContextsServer).List(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/com.docker.api.protos.context.v1.Contexts/List", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ContextsServer).List(ctx, req.(*ListRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Contexts_serviceDesc = grpc.ServiceDesc{ + ServiceName: "com.docker.api.protos.context.v1.Contexts", + HandlerType: (*ContextsServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "List", + Handler: _Contexts_List_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "protos/contexts/v1/contexts.proto", +} diff --git a/protos/cli/v1/cli.proto b/protos/contexts/v1/contexts.proto similarity index 84% rename from protos/cli/v1/cli.proto rename to protos/contexts/v1/contexts.proto index e85b16979..74f42b0cf 100644 --- a/protos/cli/v1/cli.proto +++ b/protos/contexts/v1/contexts.proto @@ -27,13 +27,13 @@ syntax = "proto3"; -package com.docker.api.protos.cli.v1; +package com.docker.api.protos.context.v1; -option go_package = "github.com/docker/api/protos/cli/v1;v1"; +option go_package = "github.com/docker/api/protos/context/v1;v1"; -service Cli { +service Contexts { // Returns the list of existing contexts - rpc Contexts(ContextsRequest) returns (ContextsResponse); + rpc List(ListRequest) returns (ListResponse); } message Context { @@ -41,10 +41,10 @@ message Context { string contextType = 2; } -message ContextsRequest { +message ListRequest { } -message ContextsResponse { +message ListResponse { repeated Context contexts = 1; } diff --git a/protos/cli/v1/doc.go b/protos/contexts/v1/doc.go similarity index 100% rename from protos/cli/v1/doc.go rename to protos/contexts/v1/doc.go diff --git a/server/contexts.go b/server/contexts.go new file mode 100644 index 000000000..2c6e88d86 --- /dev/null +++ b/server/contexts.go @@ -0,0 +1,35 @@ +package server + +import ( + "context" + + "github.com/docker/api/context/store" + contextsv1 "github.com/docker/api/protos/contexts/v1" +) + +type cliServer struct { +} + +// NewContexts returns a contexts server +func NewContexts() contextsv1.ContextsServer { + return &cliServer{} +} + +func (cs *cliServer) List(ctx context.Context, request *contextsv1.ListRequest) (*contextsv1.ListResponse, error) { + s := store.ContextStore(ctx) + contexts, err := s.List() + if err != nil { + return &contextsv1.ListResponse{}, err + } + + result := &contextsv1.ListResponse{} + + for _, c := range contexts { + result.Contexts = append(result.Contexts, &contextsv1.Context{ + Name: c.Name, + ContextType: c.Type, + }) + } + + return result, nil +} diff --git a/tests/node-client/build.sh b/tests/node-client/build.sh index 26941b0d2..44b87408d 100755 --- a/tests/node-client/build.sh +++ b/tests/node-client/build.sh @@ -1,16 +1,16 @@ node_modules/.bin/grpc_tools_node_protoc \ --js_out=import_style=commonjs,binary:./grpc \ --grpc_out=generate_package_definition:./grpc \ - -I ../../protos/cli/v1 \ + -I ../../protos/contexts/v1 \ -I ../../protos/containers/v1 \ - ../../protos/cli/v1/*.proto \ + ../../protos/contexts/v1/*.proto \ ../../protos/containers/v1/*.proto # generate d.ts codes protoc \ --plugin=protoc-gen-ts=./node_modules/.bin/protoc-gen-ts \ --ts_out=generate_package_definition:./grpc \ - -I ../../protos/cli/v1 \ + -I ../../protos/contexts/v1 \ -I ../../protos/containers/v1 \ - ../../protos/cli/v1/*.proto \ + ../../protos/contexts/v1/*.proto \ ../../protos/containers/v1/*.proto