fix service set resposne with version and label support

cmd/deploy/service-set.go

@@ -79,7 +79,6 @@ func executeDeployServiceSet(cmd *cobra.Command) {
 		log.Fatal(fmt.Sprintf("Failed to list services with conflicting versions: %s", errs.Error()))
 		return
 	}
-	var serviceNames []string
 	for _, service := range services.Services {
 
 		allowedInputsSlice := []string{Yes, No}
@@ -97,23 +96,12 @@ func executeDeployServiceSet(cmd *cobra.Command) {
 
 		if val != Yes {
 			log.Info(fmt.Sprintf("Skipping service %s from deploy", service.Name))
-			serviceNames = append(serviceNames, service.Name)
-		}
-		// Remove services from deployServiceSetRequest
-		var updatedServices []*serviceProto.ServiceIdentifier
-		for _, svc := range deployServiceSetRequest.Services {
-			shouldRemove := false
-			for _, name := range serviceNames {
-				if svc.ServiceName == name {
-					shouldRemove = true
-					break
+			for _, svc := range deployServiceSetRequest.Services {
+				if svc.ServiceName == service.Name {
+					svc.ForceFlag = false
 				}
 			}
-			if !shouldRemove {
-				updatedServices = append(updatedServices, svc)
-			}
 		}
-		deployServiceSetRequest.Services = updatedServices
 
 	}
 

internal/service/service.go

@@ -114,7 +114,7 @@ func (e *Service) DeployServiceSet(ctx *context.Context, request *serviceProto.D
 			spinnerInstance.Stop()
 			var buf bytes.Buffer
 			table := tablewriter.NewWriter(&buf)
-			table.SetHeader([]string{"Service Name", "Version", "Tags", "Action", "Status", "Error"})
+			table.SetHeader([]string{"Service Name", "Version", "Action", "Status", "Error"})
 			for _, serviceResponse := range response.GetServices() {
 				var errorMessage string
 				if serviceResponse.ServiceResponse.ServiceStatus.ServiceStatus == "FAILED" {
@@ -124,7 +124,6 @@ func (e *Service) DeployServiceSet(ctx *context.Context, request *serviceProto.D
 				row := []string{
 					serviceResponse.ServiceIdentifier.ServiceName,
 					serviceResponse.ServiceIdentifier.ServiceVersion,
-					serviceResponse.ServiceIdentifier.Tags,
 					serviceResponse.ServiceResponse.ServiceStatus.ServiceAction,
 					serviceResponse.ServiceResponse.ServiceStatus.ServiceStatus,
 					errorMessage,
@@ -342,6 +341,7 @@ func (e *Service) ConvertToDeployServiceSetRequest(serviceSet *serviceDto.Servic
 			ServiceName:    service.Name,
 			ServiceVersion: service.Version,
 			Tags:           service.Tags,
+			ForceFlag:      true,
 		})
 	}
 

proto/dream11/od/service/v1/service.proto

@@ -39,6 +39,7 @@ message ServiceIdentifier {
   string service_name = 1;
   string service_version = 2;
   string tags = 3;
+  bool force_flag = 4;
 }
 
 message DeployReleasedServiceRequest {