Add serve command that serves the cli and the containers services

2020-04-29 22:12:58 +02:00 · 2020-04-29 22:12:58 +02:00 · 40a3a20f78
parent 26c628b587
commit 40a3a20f78
5 changed files with 505 additions and 0 deletions
--- a/cli/cmd/serve.go
+++ b/cli/cmd/serve.go
@ -0,0 +1,95 @@
+package cmd
+
+import (
+	"context"
+	"net"
+
+	cliv1 "github.com/docker/api/cli/v1"
+	"github.com/docker/api/client"
+	"github.com/docker/api/containers/proxy"
+	containersv1 "github.com/docker/api/containers/v1"
+	"github.com/docker/api/context/store"
+	"github.com/docker/api/server"
+	"github.com/golang/protobuf/ptypes/empty"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+
+	"github.com/spf13/cobra"
+)
+
+type serveOpts struct {
+	address string
+}
+
+func ServeCommand() *cobra.Command {
+	var opts serveOpts
+	cmd := &cobra.Command{
+		Use:   "serve",
+		Short: "Start an api server",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return runServe(cmd.Context(), opts)
+		},
+	}
+
+	cmd.Flags().StringVar(&opts.address, "address", "", "The address to listen to")
+
+	return cmd
+}
+
+func runServe(ctx context.Context, opts serveOpts) error {
+	s := server.New()
+
+	l, err := net.Listen("unix", opts.address)
+	if err != nil {
+		return errors.Wrap(err, "listen unix socket")
+	}
+	defer l.Close()
+
+	c, err := client.New(ctx)
+	if err != nil {
+		return err
+	}
+
+	p := proxy.NewContainerApi(c.ContainerService(ctx))
+
+	containersv1.RegisterContainersServer(s, p)
+	cliv1.RegisterCliServer(s, &cliServer{
+		ctx,
+	})
+
+	go func() {
+		<-ctx.Done()
+		logrus.Info("stopping server")
+		s.Stop()
+	}()
+
+	logrus.WithField("address", opts.address).Info("serving daemon API")
+
+	// start the GRPC server to serve on the listener
+	return s.Serve(l)
+}
+
+type cliServer struct {
+	ctx context.Context
+}
+
+func (cs *cliServer) Contexts(context.Context, *empty.Empty) (*cliv1.ContextsResponse, error) {
+	s, err := store.New()
+	if err != nil {
+		logrus.Error(err)
+		return &cliv1.ContextsResponse{}, err
+	}
+	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.Metadata.Type,
+		})
+	}
+	return result, nil
+}
--- a/cli/main.go
+++ b/cli/main.go
@ -112,6 +112,7 @@ func main() {
 	root.AddCommand(
 		cmd.ContextCommand(),
 		&cmd.PsCommand,
+		cmd.ServeCommand(),
 		&cmd.ExampleCommand,
 	)

--- a/cli/v1/cli.pb.go
+++ b/cli/v1/cli.pb.go
@ -0,0 +1,322 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.21.0-devel
+// 	protoc        v3.11.4
+// source: cli/v1/cli.proto
+
+package v1
+
+import (
+	context "context"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	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_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_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_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 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_cli_v1_cli_proto_msgTypes[1]
+		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_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 ContextsResponse.ProtoReflect.Descriptor instead.
+func (*ContextsResponse) Descriptor() ([]byte, []int) {
+	return file_cli_v1_cli_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *ContextsResponse) GetContexts() []*Context {
+	if x != nil {
+		return x.Contexts
+	}
+	return nil
+}
+
+var File_cli_v1_cli_proto protoreflect.FileDescriptor
+
+var file_cli_v1_cli_proto_rawDesc = []byte{
+	0x0a, 0x10, 0x63, 0x6c, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6c, 0x69, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x12, 0x15, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x63, 0x6c, 0x69, 0x2e, 0x76, 0x31, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 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, 0x4e, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x74, 0x65,
+	0x78, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x08, 0x63,
+	0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x61, 0x70, 0x69, 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, 0x52, 0x0a, 0x03, 0x43, 0x6c, 0x69, 0x12, 0x4b,
+	0x0a, 0x08, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70,
+	0x74, 0x79, 0x1a, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2e,
+	0x61, 0x70, 0x69, 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, 0x21, 0x5a, 0x1f, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72,
+	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6c, 0x69, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_cli_v1_cli_proto_rawDescOnce sync.Once
+	file_cli_v1_cli_proto_rawDescData = file_cli_v1_cli_proto_rawDesc
+)
+
+func file_cli_v1_cli_proto_rawDescGZIP() []byte {
+	file_cli_v1_cli_proto_rawDescOnce.Do(func() {
+		file_cli_v1_cli_proto_rawDescData = protoimpl.X.CompressGZIP(file_cli_v1_cli_proto_rawDescData)
+	})
+	return file_cli_v1_cli_proto_rawDescData
+}
+
+var file_cli_v1_cli_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_cli_v1_cli_proto_goTypes = []interface{}{
+	(*Context)(nil),          // 0: com.docker.api.cli.v1.Context
+	(*ContextsResponse)(nil), // 1: com.docker.api.cli.v1.ContextsResponse
+	(*empty.Empty)(nil),      // 2: google.protobuf.Empty
+}
+var file_cli_v1_cli_proto_depIdxs = []int32{
+	0, // 0: com.docker.api.cli.v1.ContextsResponse.contexts:type_name -> com.docker.api.cli.v1.Context
+	2, // 1: com.docker.api.cli.v1.Cli.Contexts:input_type -> google.protobuf.Empty
+	1, // 2: com.docker.api.cli.v1.Cli.Contexts:output_type -> com.docker.api.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_cli_v1_cli_proto_init() }
+func file_cli_v1_cli_proto_init() {
+	if File_cli_v1_cli_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_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_cli_v1_cli_proto_msgTypes[1].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_cli_v1_cli_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   2,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_cli_v1_cli_proto_goTypes,
+		DependencyIndexes: file_cli_v1_cli_proto_depIdxs,
+		MessageInfos:      file_cli_v1_cli_proto_msgTypes,
+	}.Build()
+	File_cli_v1_cli_proto = out.File
+	file_cli_v1_cli_proto_rawDesc = nil
+	file_cli_v1_cli_proto_goTypes = nil
+	file_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 *empty.Empty, 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 *empty.Empty, opts ...grpc.CallOption) (*ContextsResponse, error) {
+	out := new(ContextsResponse)
+	err := c.cc.Invoke(ctx, "/com.docker.api.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, *empty.Empty) (*ContextsResponse, error)
+}
+
+// UnimplementedCliServer can be embedded to have forward compatible implementations.
+type UnimplementedCliServer struct {
+}
+
+func (*UnimplementedCliServer) Contexts(context.Context, *empty.Empty) (*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(empty.Empty)
+	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.cli.v1.Cli/Contexts",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CliServer).Contexts(ctx, req.(*empty.Empty))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _Cli_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "com.docker.api.cli.v1.Cli",
+	HandlerType: (*CliServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Contexts",
+			Handler:    _Cli_Contexts_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "cli/v1/cli.proto",
+}
--- a/cli/v1/cli.proto
+++ b/cli/v1/cli.proto
@ -0,0 +1,21 @@
+syntax = "proto3";
+
+package com.docker.api.cli.v1;
+
+import "google/protobuf/empty.proto";
+
+option go_package = "github.com/docker/api/cli/v1;v1";
+
+service Cli {
+    // Returns the list of existing contexts
+    rpc Contexts(google.protobuf.Empty) returns (ContextsResponse);
+}
+
+message Context {
+    string name = 1;
+    string contextType = 2;
+}
+
+message ContextsResponse {
+    repeated Context contexts = 1;
+}
--- a/containers/proxy/proxy.go
+++ b/containers/proxy/proxy.go
@ -0,0 +1,66 @@
+package proxy
+
+import (
+	"context"
+
+	"github.com/docker/api/containers"
+	v1 "github.com/docker/api/containers/v1"
+	"github.com/golang/protobuf/ptypes/empty"
+)
+
+func NewContainerApi(client containers.ContainerService) v1.ContainersServer {
+	return &proxyContainerApi{
+		client: client,
+	}
+}
+
+type proxyContainerApi struct {
+	client containers.ContainerService
+}
+
+func (p *proxyContainerApi) List(ctx context.Context, _ *v1.ListRequest) (*v1.ListResponse, error) {
+	c, err := p.client.List(ctx)
+	if err != nil {
+		return &v1.ListResponse{}, nil
+	}
+
+	response := &v1.ListResponse{
+		Containers: []*v1.Container{},
+	}
+	for _, container := range c {
+		response.Containers = append(response.Containers, &v1.Container{
+			Id:    container.ID,
+			Image: container.Image,
+		})
+	}
+
+	return response, nil
+}
+
+func (p *proxyContainerApi) Create(_ context.Context, _ *v1.CreateRequest) (*v1.CreateResponse, error) {
+	panic("not implemented") // TODO: Implement
+}
+
+func (p *proxyContainerApi) Start(_ context.Context, _ *v1.StartRequest) (*v1.StartResponse, error) {
+	panic("not implemented") // TODO: Implement
+}
+
+func (p *proxyContainerApi) Stop(_ context.Context, _ *v1.StopRequest) (*empty.Empty, error) {
+	panic("not implemented") // TODO: Implement
+}
+
+func (p *proxyContainerApi) Kill(_ context.Context, _ *v1.KillRequest) (*empty.Empty, error) {
+	panic("not implemented") // TODO: Implement
+}
+
+func (p *proxyContainerApi) Delete(_ context.Context, _ *v1.DeleteRequest) (*empty.Empty, error) {
+	panic("not implemented") // TODO: Implement
+}
+
+func (p *proxyContainerApi) Update(_ context.Context, _ *v1.UpdateRequest) (*v1.UpdateResponse, error) {
+	panic("not implemented") // TODO: Implement
+}
+
+func (p *proxyContainerApi) Exec(_ context.Context, _ *v1.ExecRequest) (*v1.ExecResponse, error) {
+	panic("not implemented") // TODO: Implement
+}