diff --git a/runtime/default.go b/runtime/default.go index 4ec72929..f0c26eec 100644 --- a/runtime/default.go +++ b/runtime/default.go @@ -163,7 +163,7 @@ func (r *runtime) Create(s *Service, opts ...CreateOption) error { o(&options) } - if len(s.Exec) == 0 && len(options.Command) == 0 { + if len(options.Command) == 0 { return errors.New("missing exec command") } @@ -179,31 +179,36 @@ func (r *runtime) Create(s *Service, opts ...CreateOption) error { // Read returns all instances of requested service // If no service name is provided we return all the track services. -func (r *runtime) Read(name string, opts ...ReadOption) ([]*Service, error) { +func (r *runtime) Read(opts ...ReadOption) ([]*Service, error) { r.Lock() defer r.Unlock() - if len(name) == 0 { - return nil, errors.New("missing service name") - } - gopts := ReadOptions{} for _, o := range opts { o(&gopts) } - var services []*Service - // if we track the service check if the version is provided - if s, ok := r.services[name]; ok { - if len(gopts.Version) > 0 { - if s.Version == gopts.Version { - services = append(services, s.Service) - } - return services, nil + save := func(k, v string) bool { + if len(k) == 0 { + return true } - // no version has sbeen requested, just append the service - services = append(services, s.Service) + return k == v } + + var services []*Service + + for _, service := range r.services { + if !save(gopts.Service, service.Name) { + continue + } + if !save(gopts.Version, service.Version) { + continue + } + // TODO deal with service type + // no version has sbeen requested, just append the service + services = append(services, service.Service) + } + return services, nil } diff --git a/runtime/kubernetes/client/kubernetes.go b/runtime/kubernetes/client/kubernetes.go index 80b14d32..9a683b27 100644 --- a/runtime/kubernetes/client/kubernetes.go +++ b/runtime/kubernetes/client/kubernetes.go @@ -27,13 +27,13 @@ type Kubernetes interface { } // NewService returns default micro kubernetes service definition -func NewService(name, version string) *Service { +func NewService(name, version, typ string) *Service { log.Tracef("kubernetes default service: name: %s, version: %s", name, version) Labels := map[string]string{ "name": name, "version": version, - "micro": "service", + "micro": typ, } svcName := name @@ -64,13 +64,13 @@ func NewService(name, version string) *Service { } // NewService returns default micro kubernetes deployment definition -func NewDeployment(name, version string) *Deployment { +func NewDeployment(name, version, typ string) *Deployment { log.Tracef("kubernetes default deployment: name: %s, version: %s", name, version) Labels := map[string]string{ "name": name, "version": version, - "micro": "service", + "micro": typ, } depName := name diff --git a/runtime/kubernetes/client/util_test.go b/runtime/kubernetes/client/util_test.go index 39fb3e0c..236f3185 100644 --- a/runtime/kubernetes/client/util_test.go +++ b/runtime/kubernetes/client/util_test.go @@ -8,16 +8,17 @@ import ( func TestTemplates(t *testing.T) { name := "foo" version := "123" + typ := "service" // Render default service - s := NewService(name, version) + s := NewService(name, version, typ) bs := new(bytes.Buffer) if err := renderTemplate(templates["service"], bs, s); err != nil { t.Errorf("Failed to render kubernetes service: %v", err) } // Render default deployment - d := NewDeployment(name, version) + d := NewDeployment(name, version, typ) bd := new(bytes.Buffer) if err := renderTemplate(templates["deployment"], bd, d); err != nil { t.Errorf("Failed to render kubernetes deployment: %v", err) diff --git a/runtime/kubernetes/kubernetes.go b/runtime/kubernetes/kubernetes.go index 7c584eac..c05f5890 100644 --- a/runtime/kubernetes/kubernetes.go +++ b/runtime/kubernetes/kubernetes.go @@ -2,7 +2,6 @@ package kubernetes import ( - "errors" "fmt" "sync" "time" @@ -204,7 +203,7 @@ func (k *kubernetes) run(events <-chan runtime.Event) { // set the default labels labels := map[string]string{ - "micro": "service", + "micro": k.options.Type, "name": name, } @@ -281,7 +280,9 @@ func (k *kubernetes) Create(s *runtime.Service, opts ...runtime.CreateOption) er k.Lock() defer k.Unlock() - var options runtime.CreateOptions + options := runtime.CreateOptions{ + Type: k.options.Type, + } for _, o := range opts { o(&options) } @@ -310,22 +311,13 @@ func (k *kubernetes) Create(s *runtime.Service, opts ...runtime.CreateOption) er } // Read returns all instances of given service -func (k *kubernetes) Read(name string, opts ...runtime.ReadOption) ([]*runtime.Service, error) { +func (k *kubernetes) Read(opts ...runtime.ReadOption) ([]*runtime.Service, error) { k.Lock() defer k.Unlock() - // if no name has been passed in, return error - if len(name) == 0 { - return nil, errors.New("missing service name") - } - - // format the name - name = client.Format(name) - // set the default labels labels := map[string]string{ - "micro": "service", - "name": name, + "micro": k.options.Type, } var options runtime.ReadOptions @@ -333,12 +325,18 @@ func (k *kubernetes) Read(name string, opts ...runtime.ReadOption) ([]*runtime.S o(&options) } + if len(options.Service) > 0 { + labels["name"] = client.Format(options.Service) + } + // add version to labels if a version has been supplied if len(options.Version) > 0 { labels["version"] = options.Version } - log.Debugf("Runtime querying service %s", name) + if len(options.Type) > 0 { + labels["type"] = options.Type + } return k.getService(labels) } @@ -349,7 +347,7 @@ func (k *kubernetes) List() ([]*runtime.Service, error) { defer k.Unlock() labels := map[string]string{ - "micro": "service", + "micro": k.options.Type, } log.Debugf("Runtime listing all micro services") @@ -360,7 +358,9 @@ func (k *kubernetes) List() ([]*runtime.Service, error) { // Update the service in place func (k *kubernetes) Update(s *runtime.Service) error { // create new kubernetes micro service - service := newService(s, runtime.CreateOptions{}) + service := newService(s, runtime.CreateOptions{ + Type: k.options.Type, + }) // update build time annotation service.kdeploy.Spec.Template.Metadata.Annotations["build"] = time.Now().Format(time.RFC3339) @@ -382,7 +382,9 @@ func (k *kubernetes) Delete(s *runtime.Service) error { defer k.Unlock() // create new kubernetes micro service - service := newService(s, runtime.CreateOptions{}) + service := newService(s, runtime.CreateOptions{ + Type: k.options.Type, + }) log.Debugf("Runtime queueing service %s for delete action", service.Name) @@ -457,7 +459,10 @@ func (k *kubernetes) String() string { // NewRuntime creates new kubernetes runtime func NewRuntime(opts ...runtime.Option) runtime.Runtime { // get default options - options := runtime.Options{} + options := runtime.Options{ + // Create labels with type "micro": "service" + Type: "service", + } // apply requested options for _, o := range opts { diff --git a/runtime/kubernetes/service.go b/runtime/kubernetes/service.go index e4a5c6ad..ec837682 100644 --- a/runtime/kubernetes/service.go +++ b/runtime/kubernetes/service.go @@ -23,8 +23,8 @@ func newService(s *runtime.Service, c runtime.CreateOptions) *service { name := client.Format(s.Name) version := client.Format(s.Version) - kservice := client.NewService(name, version) - kdeploy := client.NewDeployment(name, version) + kservice := client.NewService(name, version, c.Type) + kdeploy := client.NewDeployment(name, version, c.Type) // attach our values to the deployment; name, version, source kdeploy.Metadata.Annotations["name"] = s.Name @@ -53,10 +53,8 @@ func newService(s *runtime.Service, c runtime.CreateOptions) *service { kdeploy.Spec.Template.PodSpec.Containers[0].Env = append(kdeploy.Spec.Template.PodSpec.Containers[0].Env, env...) } - // if Exec/Command has been supplied override the default command - if len(s.Exec) > 0 { - kdeploy.Spec.Template.PodSpec.Containers[0].Command = s.Exec - } else if len(c.Command) > 0 { + // specify the command to exec + if len(c.Command) > 0 { kdeploy.Spec.Template.PodSpec.Containers[0].Command = c.Command } else if len(s.Source) > 0 { // default command for our k8s service should be source diff --git a/runtime/options.go b/runtime/options.go index cbc93952..a61be888 100644 --- a/runtime/options.go +++ b/runtime/options.go @@ -10,17 +10,28 @@ type Option func(o *Options) type Options struct { // Notifier for updates Notifier Notifier + // Service type to manage + Type string } -// AutoUpdate enables micro auto-updates +// WithNotifier specifies a notifier for updates func WithNotifier(n Notifier) Option { return func(o *Options) { o.Notifier = n } } +// WithType sets the service type to manage +func WithType(t string) Option { + return func(o *Options) { + o.Type = t + } +} + type CreateOption func(o *CreateOptions) +type ReadOption func(o *ReadOptions) + // CreateOptions configure runtime services type CreateOptions struct { // command to execute including args @@ -29,6 +40,18 @@ type CreateOptions struct { Env []string // Log output Output io.Writer + // Type of service to create + Type string +} + +// ReadOptions queries runtime services +type ReadOptions struct { + // Service name + Service string + // Version queries services with given version + Version string + // Type of service + Type string } // WithCommand specifies the command to execute @@ -55,17 +78,23 @@ func WithOutput(out io.Writer) CreateOption { } } -type ReadOption func(o *ReadOptions) - -// ReadOptions queries runtime services -type ReadOptions struct { - // Version queries services with given version - Version string +// ReadService returns services with the given name +func ReadService(service string) ReadOption { + return func(o *ReadOptions) { + o.Service = service + } } // WithVersion confifgures service version -func WithVersion(version string) ReadOption { +func ReadVersion(version string) ReadOption { return func(o *ReadOptions) { o.Version = version } } + +// ReadType returns services of the given type +func ReadType(t string) ReadOption { + return func(o *ReadOptions) { + o.Type = t + } +} diff --git a/runtime/runtime.go b/runtime/runtime.go index b6e17c31..ef584960 100644 --- a/runtime/runtime.go +++ b/runtime/runtime.go @@ -17,7 +17,7 @@ type Runtime interface { // Create registers a service Create(*Service, ...CreateOption) error // Read returns the service - Read(string, ...ReadOption) ([]*Service, error) + Read(...ReadOption) ([]*Service, error) // Update the service in place Update(*Service) error // Remove a service @@ -84,10 +84,6 @@ type Service struct { Version string // url location of source Source string - // Path to store source - Path string - // Exec command - Exec []string // Metadata stores metadata Metadata map[string]string } diff --git a/runtime/service.go b/runtime/service.go index a3945d64..75e96fbf 100644 --- a/runtime/service.go +++ b/runtime/service.go @@ -37,22 +37,11 @@ func newService(s *Service, c CreateOptions) *service { var exec string var args []string - if len(s.Exec) > 0 { - if len(s.Exec) > 0 { - exec = s.Exec[0] - } - args = []string{} - - if len(s.Exec) > 1 { - args = s.Exec[1:] - } - } else { - // set command - exec = c.Command[0] - // set args - if len(c.Command) > 1 { - args = c.Command[1:] - } + // set command + exec = c.Command[0] + // set args + if len(c.Command) > 1 { + args = c.Command[1:] } return &service{ diff --git a/runtime/service/handler/handler.go b/runtime/service/handler/handler.go index 48c714ef..449043f6 100644 --- a/runtime/service/handler/handler.go +++ b/runtime/service/handler/handler.go @@ -17,8 +17,6 @@ func toProto(s *runtime.Service) *pb.Service { Name: s.Name, Version: s.Version, Source: s.Source, - Path: s.Path, - Exec: s.Exec, Metadata: s.Metadata, } } @@ -28,8 +26,6 @@ func toService(s *pb.Service) *runtime.Service { Name: s.Name, Version: s.Version, Source: s.Source, - Path: s.Path, - Exec: s.Exec, Metadata: s.Metadata, } } @@ -56,9 +52,14 @@ func toCreateOptions(opts *pb.CreateOptions) []runtime.CreateOption { func toReadOptions(opts *pb.ReadOptions) []runtime.ReadOption { options := []runtime.ReadOption{} - // version options + if len(opts.Service) > 0 { + options = append(options, runtime.ReadService(opts.Service)) + } if len(opts.Version) > 0 { - options = append(options, runtime.WithVersion(opts.Version)) + options = append(options, runtime.ReadVersion(opts.Version)) + } + if len(opts.Type) > 0 { + options = append(options, runtime.ReadType(opts.Type)) } return options @@ -84,16 +85,12 @@ func (r *Runtime) Create(ctx context.Context, req *pb.CreateRequest, rsp *pb.Cre } func (r *Runtime) Read(ctx context.Context, req *pb.ReadRequest, rsp *pb.ReadResponse) error { - if len(req.Name) == 0 { - return errors.BadRequest("go.micro.runtime", "blank service") - } - var options []runtime.ReadOption if req.Options != nil { options = toReadOptions(req.Options) } - services, err := r.Runtime.Read(req.Name, options...) + services, err := r.Runtime.Read(options...) if err != nil { return errors.InternalServerError("go.micro.runtime", err.Error()) } diff --git a/runtime/service/proto/runtime.pb.go b/runtime/service/proto/runtime.pb.go index f6610a97..9d82b555 100644 --- a/runtime/service/proto/runtime.pb.go +++ b/runtime/service/proto/runtime.pb.go @@ -27,12 +27,8 @@ type Service struct { Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` // git url of the source Source string `protobuf:"bytes,3,opt,name=source,proto3" json:"source,omitempty"` - // local path of the source - Path string `protobuf:"bytes,4,opt,name=path,proto3" json:"path,omitempty"` - // command to execute - Exec []string `protobuf:"bytes,5,rep,name=exec,proto3" json:"exec,omitempty"` // service metadata - Metadata map[string]string `protobuf:"bytes,6,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Metadata map[string]string `protobuf:"bytes,4,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -84,20 +80,6 @@ func (m *Service) GetSource() string { return "" } -func (m *Service) GetPath() string { - if m != nil { - return m.Path - } - return "" -} - -func (m *Service) GetExec() []string { - if m != nil { - return m.Exec - } - return nil -} - func (m *Service) GetMetadata() map[string]string { if m != nil { return m.Metadata @@ -242,8 +224,12 @@ func (m *CreateResponse) XXX_DiscardUnknown() { var xxx_messageInfo_CreateResponse proto.InternalMessageInfo type ReadOptions struct { + // service name + Service string `protobuf:"bytes,1,opt,name=service,proto3" json:"service,omitempty"` // version of the service - Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` + Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` + // type of service + Type string `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -274,6 +260,13 @@ func (m *ReadOptions) XXX_DiscardUnknown() { var xxx_messageInfo_ReadOptions proto.InternalMessageInfo +func (m *ReadOptions) GetService() string { + if m != nil { + return m.Service + } + return "" +} + func (m *ReadOptions) GetVersion() string { if m != nil { return m.Version @@ -281,9 +274,15 @@ func (m *ReadOptions) GetVersion() string { return "" } +func (m *ReadOptions) GetType() string { + if m != nil { + return m.Type + } + return "" +} + type ReadRequest struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Options *ReadOptions `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"` + Options *ReadOptions `protobuf:"bytes,1,opt,name=options,proto3" json:"options,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -314,13 +313,6 @@ func (m *ReadRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ReadRequest proto.InternalMessageInfo -func (m *ReadRequest) GetName() string { - if m != nil { - return m.Name - } - return "" -} - func (m *ReadRequest) GetOptions() *ReadOptions { if m != nil { return m.Options @@ -599,37 +591,36 @@ func init() { } var fileDescriptor_4bc91a8efec81434 = []byte{ - // 498 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4b, 0x6f, 0xd3, 0x40, - 0x10, 0xae, 0xe3, 0xd4, 0x2e, 0x63, 0x8c, 0xa2, 0x15, 0x42, 0x4b, 0x25, 0x20, 0xf2, 0xa5, 0xbd, - 0xe0, 0x48, 0xae, 0x10, 0xaf, 0x63, 0x53, 0x71, 0x21, 0x42, 0x72, 0xc5, 0x85, 0xdb, 0xe2, 0x8c, - 0x8a, 0x45, 0xed, 0x35, 0xde, 0x75, 0x44, 0x4f, 0x5c, 0xf9, 0xcb, 0xdc, 0xd0, 0xbe, 0x42, 0xe2, - 0xda, 0x5c, 0x72, 0x9b, 0x99, 0x9d, 0xfd, 0xfc, 0x3d, 0x56, 0x86, 0xac, 0x2a, 0x8b, 0x96, 0x2f, - 0x6e, 0xf8, 0x4b, 0x53, 0xb4, 0x5d, 0x2d, 0xcb, 0x0a, 0x17, 0x02, 0xdb, 0x4d, 0x59, 0xe0, 0xa2, - 0x69, 0xb9, 0xdc, 0x4e, 0x53, 0xdd, 0x91, 0xd9, 0x0d, 0x4f, 0xf5, 0x76, 0x6a, 0xe7, 0xc9, 0x1f, - 0x0f, 0xc2, 0x6b, 0x73, 0x83, 0x10, 0x98, 0xd6, 0xac, 0x42, 0xea, 0xcd, 0xbd, 0xf3, 0x07, 0xb9, - 0xae, 0x09, 0x85, 0x70, 0x83, 0xad, 0x28, 0x79, 0x4d, 0x27, 0x7a, 0xec, 0x5a, 0xf2, 0x04, 0x02, - 0xc1, 0xbb, 0xb6, 0x40, 0xea, 0xeb, 0x03, 0xdb, 0x29, 0x94, 0x86, 0xc9, 0x6f, 0x74, 0x6a, 0x50, - 0x54, 0xad, 0x66, 0xf8, 0x13, 0x0b, 0x7a, 0x3c, 0xf7, 0xd5, 0x4c, 0xd5, 0xe4, 0x12, 0x4e, 0x2a, - 0x94, 0x6c, 0xcd, 0x24, 0xa3, 0xc1, 0xdc, 0x3f, 0x8f, 0xb2, 0xb3, 0xb4, 0x4f, 0x2f, 0xb5, 0xd4, - 0xd2, 0x95, 0xdd, 0xbc, 0xaa, 0x65, 0x7b, 0x97, 0x6f, 0x2f, 0x9e, 0xbe, 0x87, 0x78, 0xef, 0x88, - 0xcc, 0xc0, 0xff, 0x8e, 0x77, 0x56, 0x82, 0x2a, 0xc9, 0x63, 0x38, 0xde, 0xb0, 0xdb, 0x0e, 0x2d, - 0x7f, 0xd3, 0xbc, 0x9b, 0xbc, 0xf1, 0x92, 0x6b, 0x88, 0x2f, 0x5b, 0x64, 0x12, 0x3f, 0x35, 0xb2, - 0xe4, 0xb5, 0x50, 0x62, 0x0b, 0x5e, 0x55, 0xac, 0x5e, 0x53, 0x4f, 0x33, 0x75, 0xad, 0x82, 0xc5, - 0x7a, 0x43, 0x27, 0x7a, 0xaa, 0x4a, 0x25, 0x9f, 0x77, 0xb2, 0xe9, 0xa4, 0x93, 0x6f, 0xba, 0xe4, - 0x97, 0x03, 0xcd, 0xf1, 0x47, 0x87, 0x42, 0x92, 0x0b, 0x08, 0x6d, 0x24, 0x9a, 0x55, 0x94, 0x3d, - 0x1d, 0x95, 0x99, 0xbb, 0x4d, 0xf2, 0x16, 0x42, 0x6e, 0x48, 0x69, 0xda, 0x51, 0xf6, 0xe2, 0xfe, - 0xa5, 0x3d, 0xee, 0xb9, 0xdb, 0x4f, 0x66, 0xf0, 0xc8, 0x11, 0x10, 0x0d, 0xaf, 0x05, 0x26, 0x67, - 0x10, 0xe5, 0xc8, 0xd6, 0x3b, 0x2a, 0x87, 0x23, 0x4d, 0xbe, 0x98, 0x45, 0xc7, 0x7c, 0xe8, 0x3d, - 0xbc, 0xee, 0x13, 0x7b, 0x76, 0x9f, 0xd8, 0xce, 0xc7, 0xfe, 0xd1, 0xba, 0x82, 0x87, 0x06, 0xdb, - 0x90, 0x22, 0xaf, 0xe0, 0xc4, 0x8a, 0x15, 0xda, 0xec, 0xff, 0xfa, 0xb2, 0x5d, 0x4d, 0x96, 0x10, - 0x2f, 0xf1, 0x16, 0x0f, 0xb3, 0x57, 0x79, 0xe4, 0x50, 0xac, 0x47, 0x4b, 0x88, 0x3f, 0x37, 0x6b, - 0x76, 0x38, 0xae, 0x43, 0xb1, 0xb8, 0x31, 0x44, 0x1f, 0x4b, 0x21, 0x2d, 0xaa, 0x72, 0xc1, 0xb4, - 0x07, 0xb9, 0x90, 0xfd, 0xf6, 0x21, 0xcc, 0xcd, 0x29, 0x59, 0x41, 0x60, 0xf2, 0x26, 0xa3, 0x6f, - 0xc4, 0x7e, 0xfd, 0x74, 0x3e, 0xbe, 0x60, 0xe9, 0x1e, 0x91, 0x0f, 0x30, 0x55, 0x39, 0x91, 0x91, - 0x5c, 0x1d, 0xd4, 0xf3, 0xb1, 0xe3, 0x2d, 0xd0, 0x0a, 0x02, 0xe3, 0xf1, 0x10, 0xaf, 0xbd, 0x0c, - 0x87, 0x78, 0xf5, 0xe2, 0xd1, 0x70, 0xc6, 0xda, 0x21, 0xb8, 0xbd, 0xe8, 0x86, 0xe0, 0x7a, 0xa9, - 0x68, 0x99, 0x2a, 0x88, 0x21, 0x99, 0x3b, 0x79, 0x0d, 0xc9, 0xdc, 0xcd, 0x2f, 0x39, 0xfa, 0x1a, - 0xe8, 0x3f, 0xeb, 0xc5, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbe, 0x95, 0xdf, 0xf9, 0x8f, 0x05, - 0x00, 0x00, + // 492 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0xae, 0xe3, 0x10, 0xb7, 0x63, 0x8c, 0xa2, 0x15, 0x42, 0xa6, 0x12, 0x10, 0xf9, 0x42, 0x2f, + 0x38, 0x92, 0x2b, 0xc4, 0xdf, 0xb1, 0x29, 0x5c, 0x88, 0x90, 0x5c, 0xf5, 0x01, 0x96, 0x64, 0x54, + 0x59, 0xd4, 0x5e, 0xb3, 0xbb, 0x8e, 0x94, 0x13, 0x57, 0x5e, 0x8f, 0x37, 0x42, 0xfb, 0x97, 0xd8, + 0xa9, 0xdd, 0x4b, 0x6e, 0x33, 0xbb, 0xb3, 0xdf, 0x7c, 0x3f, 0x96, 0x21, 0x2b, 0x8b, 0x15, 0x67, + 0xf3, 0x3b, 0xf6, 0xce, 0x14, 0xbc, 0xa9, 0x64, 0x51, 0xe2, 0x5c, 0x20, 0xdf, 0x14, 0x2b, 0x9c, + 0xd7, 0x9c, 0xc9, 0xdd, 0x69, 0xaa, 0x3b, 0x32, 0xbd, 0x63, 0xa9, 0x9e, 0x4e, 0xed, 0x79, 0xf2, + 0xcf, 0x83, 0xe0, 0xc6, 0xbc, 0x20, 0x04, 0xc6, 0x15, 0x2d, 0x31, 0xf6, 0x66, 0xde, 0xc5, 0x59, + 0xae, 0x6b, 0x12, 0x43, 0xb0, 0x41, 0x2e, 0x0a, 0x56, 0xc5, 0x23, 0x7d, 0xec, 0x5a, 0xf2, 0x02, + 0x26, 0x82, 0x35, 0x7c, 0x85, 0xb1, 0xaf, 0x2f, 0x6c, 0x47, 0xae, 0xe0, 0xb4, 0x44, 0x49, 0xd7, + 0x54, 0xd2, 0x78, 0x3c, 0xf3, 0x2f, 0xc2, 0xec, 0x6d, 0x7a, 0xb8, 0x36, 0xb5, 0x2b, 0xd3, 0xa5, + 0x9d, 0xbc, 0xae, 0x24, 0xdf, 0xe6, 0xbb, 0x87, 0xe7, 0x5f, 0x20, 0xea, 0x5c, 0x91, 0x29, 0xf8, + 0xbf, 0x70, 0x6b, 0xa9, 0xa9, 0x92, 0x3c, 0x87, 0x27, 0x1b, 0x7a, 0xdf, 0xa0, 0xe5, 0x65, 0x9a, + 0xcf, 0xa3, 0x8f, 0x5e, 0x72, 0x03, 0xd1, 0x15, 0x47, 0x2a, 0xf1, 0x47, 0x2d, 0x0b, 0x56, 0x09, + 0x25, 0x62, 0xc5, 0xca, 0x92, 0x56, 0xeb, 0xd8, 0x9b, 0xf9, 0x4a, 0x84, 0x6d, 0x15, 0x2c, 0x56, + 0x9b, 0x78, 0xa4, 0x4f, 0x55, 0xa9, 0x64, 0xb1, 0x46, 0xd6, 0x8d, 0x74, 0xb2, 0x4c, 0x97, 0xfc, + 0x71, 0xa0, 0x39, 0xfe, 0x6e, 0x50, 0x48, 0x72, 0x09, 0x81, 0xb5, 0x5a, 0xb3, 0x0a, 0xb3, 0x97, + 0x83, 0x32, 0x73, 0x37, 0x49, 0x3e, 0x41, 0xc0, 0x0c, 0x29, 0x4d, 0x3b, 0xcc, 0xde, 0x3c, 0x7c, + 0xd4, 0xe1, 0x9e, 0xbb, 0xf9, 0x64, 0x0a, 0xcf, 0x1c, 0x01, 0x51, 0xb3, 0x4a, 0x60, 0x72, 0x0b, + 0x61, 0x8e, 0x74, 0xdd, 0x52, 0xd9, 0x26, 0x74, 0xb6, 0xdf, 0x3a, 0x1c, 0x22, 0x81, 0xb1, 0xdc, + 0xd6, 0x2e, 0x42, 0x5d, 0x27, 0x5f, 0x0d, 0xac, 0xd3, 0xf9, 0x61, 0x4f, 0xd9, 0xe8, 0x7c, 0xf5, + 0x90, 0x72, 0x8b, 0xc6, 0x9e, 0xf0, 0x35, 0x3c, 0x35, 0x38, 0x86, 0x2e, 0x79, 0x0f, 0xa7, 0x96, + 0x90, 0xd0, 0x31, 0x3c, 0xea, 0xd8, 0x6e, 0x34, 0x59, 0x40, 0xb4, 0xc0, 0x7b, 0x3c, 0xce, 0x78, + 0xe5, 0x9e, 0x43, 0xb1, 0xee, 0x2d, 0x20, 0xba, 0xad, 0xd7, 0xf4, 0x78, 0x5c, 0x87, 0x62, 0x71, + 0x23, 0x08, 0xbf, 0x17, 0x42, 0x5a, 0x54, 0xe5, 0x82, 0x69, 0x8f, 0x72, 0x21, 0xfb, 0xeb, 0x43, + 0x90, 0x9b, 0x5b, 0xb2, 0x84, 0x89, 0xf9, 0x12, 0xc8, 0xe0, 0xd7, 0x63, 0xb7, 0x9f, 0xcf, 0x86, + 0x07, 0x2c, 0xdd, 0x13, 0xf2, 0x0d, 0xc6, 0x2a, 0x27, 0x32, 0x90, 0xab, 0x83, 0x7a, 0x3d, 0x74, + 0xbd, 0x03, 0x5a, 0xc2, 0xc4, 0x78, 0xdc, 0xc7, 0xab, 0x93, 0x61, 0x1f, 0xaf, 0x83, 0x78, 0x34, + 0x9c, 0xb1, 0xb6, 0x0f, 0xae, 0x13, 0x5d, 0x1f, 0xdc, 0x41, 0x2a, 0x5a, 0xa6, 0x0a, 0xa2, 0x4f, + 0x66, 0x2b, 0xaf, 0x3e, 0x99, 0xed, 0xfc, 0x92, 0x93, 0x9f, 0x13, 0xfd, 0x2f, 0xbd, 0xfc, 0x1f, + 0x00, 0x00, 0xff, 0xff, 0x14, 0x09, 0x5e, 0x98, 0x81, 0x05, 0x00, 0x00, } diff --git a/runtime/service/proto/runtime.proto b/runtime/service/proto/runtime.proto index 86814f9d..3da3b17d 100644 --- a/runtime/service/proto/runtime.proto +++ b/runtime/service/proto/runtime.proto @@ -17,12 +17,8 @@ message Service { string version = 2; // git url of the source string source = 3; - // local path of the source - string path = 4; - // command to execute - repeated string exec = 5; // service metadata - map metadata = 6; + map metadata = 4; } message CreateOptions { @@ -42,13 +38,16 @@ message CreateRequest { message CreateResponse {} message ReadOptions { - // version of the service - string version = 2; + // service name + string service = 1; + // version of the service + string version = 2; + // type of service + string type = 3; } message ReadRequest { - string name = 1; - ReadOptions options = 2; + ReadOptions options = 1; } message ReadResponse { diff --git a/runtime/service/service.go b/runtime/service/service.go index 769f0d69..91e62df8 100644 --- a/runtime/service/service.go +++ b/runtime/service/service.go @@ -76,7 +76,7 @@ func (s *svc) Create(svc *runtime.Service, opts ...runtime.CreateOption) error { } // Read returns the service with the given name from the runtime -func (s *svc) Read(name string, opts ...runtime.ReadOption) ([]*runtime.Service, error) { +func (s *svc) Read(opts ...runtime.ReadOption) ([]*runtime.Service, error) { options := runtime.ReadOptions{} // apply requested options for _, o := range opts { @@ -85,9 +85,10 @@ func (s *svc) Read(name string, opts ...runtime.ReadOption) ([]*runtime.Service, // runtime service create request req := &pb.ReadRequest{ - Name: name, Options: &pb.ReadOptions{ + Service: options.Service, Version: options.Version, + Type: options.Type, }, } @@ -102,8 +103,6 @@ func (s *svc) Read(name string, opts ...runtime.ReadOption) ([]*runtime.Service, Name: service.Name, Version: service.Version, Source: service.Source, - Path: service.Path, - Exec: service.Exec, Metadata: service.Metadata, } services = append(services, svc) @@ -160,8 +159,6 @@ func (s *svc) List() ([]*runtime.Service, error) { Name: service.Name, Version: service.Version, Source: service.Source, - Path: service.Path, - Exec: service.Exec, Metadata: service.Metadata, } services = append(services, svc)