Merge pull request #734 from mesg-foundation/fix/consistent-sid

Use service id
mesg-foundation · Jan 27, 2019 · 938c878 · 938c878
2 parents fc4e57b + c14ecbc
commit 938c878
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/api/execute.go b/api/execute.go
@@ -52,7 +52,7 @@ func (e *taskExecutor) checkServiceStatus(s *service.Service) error {
 		return err
 	}
 	if status != service.RUNNING {
-		return &NotRunningServiceError{ServiceID: s.Hash}
+		return &NotRunningServiceError{ServiceID: s.Sid}
 	}
 	return nil
 }

diff --git a/commands/provider/service_provider.go b/commands/provider/service_provider.go
@@ -61,7 +61,7 @@ func (p *ServiceProvider) ServiceDeleteAll(deleteData bool) error {
 				errs.Append(err)
 			}
 			wg.Done()
-		}(s.Hash)
+		}(s.Sid)
 	}
 	wg.Wait()
 	return errs.ErrorOrNil()

diff --git a/commands/service_deploy.go b/commands/service_deploy.go
@@ -68,7 +68,7 @@ func (c *serviceDeployCmd) runE(cmd *cobra.Command, args []string) error {
 			errors.New("to get more information, run: mesg-core service validate"),
 		}
 	}
-	fmt.Printf("%s Service deployed with hash: %v\n", pretty.SuccessSign, pretty.Success(id))
+	fmt.Printf("%s Service deployed with id: %v\n", pretty.SuccessSign, pretty.Success(id))
 	fmt.Printf("To start it, run the command:\n\tmesg-core service start %s\n", id)
 	return nil
 }

diff --git a/commands/service_deploy_test.go b/commands/service_deploy_test.go
@@ -56,7 +56,7 @@ func TestServiceDeploy(t *testing.T) {
 
 	require.Equal(t, "✔ 5", string(readLine(t, r)))
 	require.Equal(t, "⨯ 6", string(readLine(t, r)))
-	require.Equal(t, "✔ Service deployed with hash: 2", string(readLine(t, r)))
+	require.Equal(t, "✔ Service deployed with id: 2", string(readLine(t, r)))
 	require.Equal(t, "To start it, run the command:", string(readLine(t, r)))
 	require.Equal(t, "	mesg-core service start 2", string(readLine(t, r)))
 

diff --git a/interface/grpc/core/deploy.go b/interface/grpc/core/deploy.go
@@ -66,7 +66,7 @@ func (s *Server) DeployService(stream coreapi.Core_DeployServiceServer) error {
 
 	return stream.Send(&coreapi.DeployServiceReply{
 		Value: &coreapi.DeployServiceReply_ServiceID{
-			ServiceID: service.Hash,
+			ServiceID: service.Sid,
 		},
 	})
 }

diff --git a/interface/grpc/core/deploy_integration_test.go b/interface/grpc/core/deploy_integration_test.go
@@ -19,7 +19,7 @@ func TestIntegrationDeployService(t *testing.T) {
 	require.Nil(t, server.DeployService(stream))
 	defer server.api.DeleteService(stream.serviceID, false)
 
-	require.Len(t, stream.serviceID, 40)
+	require.Len(t, stream.serviceID, 7)
 	require.Contains(t, stream.statuses, api.DeployStatus{
 		Message: "Image built with success",
 		Type:    api.DonePositive,

diff --git a/interface/grpc/core/deploy_test.go b/interface/grpc/core/deploy_test.go
@@ -20,7 +20,7 @@ func TestDeployService(t *testing.T) {
 
 	stream := newTestDeployStream(url)
 	require.Nil(t, server.DeployService(stream))
-	require.Len(t, stream.serviceID, 40)
+	require.Len(t, stream.serviceID, 7)
 
 	require.Contains(t, stream.statuses, api.DeployStatus{
 		Message: "Image built with success",

diff --git a/interface/grpc/core/execute_test.go b/interface/grpc/core/execute_test.go
@@ -27,7 +27,7 @@ func TestExecute(t *testing.T) {
 	defer server.api.StopService(s.Hash)
 
 	reply, err := server.ExecuteTask(context.Background(), &coreapi.ExecuteTaskRequest{
-		ServiceID: s.Hash,
+		ServiceID: s.Sid,
 		TaskKey:   taskKey,
 		InputData: data,
 	})
@@ -45,7 +45,7 @@ func TestExecuteWithInvalidJSON(t *testing.T) {
 	defer server.api.DeleteService(s.Hash, false)
 
 	_, err = server.ExecuteTask(context.Background(), &coreapi.ExecuteTaskRequest{
-		ServiceID: s.Hash,
+		ServiceID: s.Sid,
 		TaskKey:   "test",
 		InputData: "",
 	})
@@ -69,7 +69,7 @@ func TestExecuteWithInvalidTask(t *testing.T) {
 	defer server.api.StopService(s.Hash)
 
 	_, err = server.ExecuteTask(context.Background(), &coreapi.ExecuteTaskRequest{
-		ServiceID: s.Hash,
+		ServiceID: s.Sid,
 		TaskKey:   taskKey,
 		InputData: "{}",
 	})
@@ -97,7 +97,7 @@ func TestExecuteWithInvalidTaskInput(t *testing.T) {
 	defer server.api.StopService(s.Hash)
 
 	_, err = server.ExecuteTask(context.Background(), &coreapi.ExecuteTaskRequest{
-		ServiceID: s.Hash,
+		ServiceID: s.Sid,
 		TaskKey:   taskKey,
 		InputData: data,
 	})
@@ -118,11 +118,11 @@ func TestExecuteWithNonRunningService(t *testing.T) {
 	defer server.api.DeleteService(s.Hash, false)
 
 	_, err = server.ExecuteTask(context.Background(), &coreapi.ExecuteTaskRequest{
-		ServiceID: s.Hash,
+		ServiceID: s.Sid,
 		TaskKey:   "test",
 		InputData: "{}",
 	})
-	require.Equal(t, &api.NotRunningServiceError{ServiceID: s.Hash}, err)
+	require.Equal(t, &api.NotRunningServiceError{ServiceID: s.Sid}, err)
 }
 
 func TestExecuteWithNonExistingService(t *testing.T) {