Service rm

api/rpc/service/service.go

@@ -35,13 +35,26 @@ func init() {
 
 // Create implements ServiceServer
 func (s *Service) Create(ctx context.Context, req *ServiceCreateRequest) (*ServiceCreateResponse, error) {
-	// TODO: pass-through right now, but will be refactored into a helper library
-	response, err := CreateService(docker, ctx, req)
+	response, err := Create(ctx, req)
 	return response, err
 }
 
-// CreateService uses docker api to create a service
-func CreateService(docker *client.Client, ctx context.Context, req *ServiceCreateRequest) (*ServiceCreateResponse, error) {
+// Remove implements ServiceServer
+func (s *Service) Remove(ctx context.Context, req *RemoveRequest) (*RemoveResponse, error) {
+	err := Remove(ctx, req.Ident)
+	if err != nil {
+		return nil, err
+	}
+
+	response := &RemoveResponse{
+		Ident: req.Ident,
+	}
+
+	return response, nil
+}
+
+// Create uses docker api to create a service
+func Create(ctx context.Context, req *ServiceCreateRequest) (*ServiceCreateResponse, error) {
 
 	serv := req.ServiceSpec
 	service := swarm.ServiceSpec{
@@ -129,7 +142,7 @@ func CreateService(docker *client.Client, ctx context.Context, req *ServiceCreat
 }
 
 // Remove uses docker api to remove a service
-func (s *Service) Remove(ctx context.Context, ID string) error {
+func Remove(ctx context.Context, ID string) error {
 	fmt.Printf("Service removed %s\n", ID)
 	return docker.ServiceRemove(ctx, ID)
 }

api/rpc/service/service.proto

@@ -2,23 +2,6 @@ syntax = "proto3";
 
 package service;
 
-service Service {
-  rpc Create (ServiceCreateRequest) returns (ServiceCreateResponse) {}
-}
-
-message ServiceCreateRequest {
-  ServiceSpec service_spec = 1;
-}
-
-message ServiceCreateResponse {
-  string id = 1;
-}
-
-message ServiceRemoveRequest {
-  string service_id = 1;
-}
-
-
 message ServiceSpec {
   string image = 1;
   string name = 2;
@@ -35,3 +18,25 @@ message PublishSpec {
   uint32 publish_port = 3;
   uint32 internal_port = 4;
 }
+
+message ServiceCreateRequest {
+  ServiceSpec service_spec = 1;
+}
+
+message ServiceCreateResponse {
+  string id = 1;
+}
+
+message RemoveRequest {
+  string ident = 1;
+}
+
+message RemoveResponse {
+  string ident = 1;
+}
+
+
+service Service {
+  rpc Create (ServiceCreateRequest) returns (ServiceCreateResponse) {}
+  rpc Remove (RemoveRequest) returns (RemoveResponse) {}
+}

api/rpc/stack/stack.go

@@ -86,10 +86,9 @@ func (s *Server) getStack(ctx context.Context, in *StackRequest) (*Stack, error)
 // clean up if error happended during stack creation, delete all created services and all etcd data
 func (s *Server) rollbackServiceStack(ctx context.Context, stackID string, serviceIDList []string) {
 	fmt.Printf("removing created services %s\n", stackID)
-	server := service.Service{}
 	for _, ID := range serviceIDList {
 		if ID != "" {
-			server.Remove(ctx, ID)
+			service.Remove(ctx, ID)
 			s.Store.Delete(ctx, path.Join(servicesRootKey, ID), true, nil)
 		}
 	}
@@ -207,15 +206,14 @@ func (s *Server) Stop(ctx context.Context, in *StackRequest) (*StackReply, error
 }
 
 func (s *Server) stopStackServices(ctx context.Context, ID string, force bool) error {
-	server := service.Service{}
 	listKeys := &ServiceIdList{}
 	err := s.Store.Get(ctx, path.Join(stackRootKey, ID, servicesRootKey), listKeys, true)
 	if err != nil && !force {
 		return err
 	}
 	var removeErr error
 	for _, key := range listKeys.List {
-		err := server.Remove(ctx, key)
+		err := service.Remove(ctx, key)
 		if err != nil {
 			removeErr = err
 		}

api/rpc/stack/test_samples/sample-05-labels.yml

@@ -0,0 +1,7 @@
+pinger:
+  image: appcelerator/pinger
+  labels:
+    - "foo=bar"
+  public:
+    - publish_port: 3000
+      internal_port: 3000

api/rpc/stack/test_samples/sample-06-labels.yml

@@ -0,0 +1,7 @@
+pinger:
+  image: appcelerator/pinger
+  labels:
+    foo: bar
+  public:
+    - publish_port: 3000
+      internal_port: 3000