deploy service-set changes

cmd/deploy/service-set.go

@@ -65,18 +65,15 @@ func executeDeployServiceSet(cmd *cobra.Command) {
 	conflictingServicesRequest := &serviceProto.GetConflictingServicesRequest{
 		EnvName: env,
 		Name:    deployServiceSetRequest.Name,
-		// Add other necessary fields from deployServiceSetRequest if needed
 	}
 
 	services, errs := serviceClient.GetConflictingServices(&ctx, conflictingServicesRequest)
 	if errs != nil {
 		log.Fatal("Failed to list services with conflicting versions. ", errs)
 		return
 	}
-	//create empty array of strings
 	var serviceNames []string
 	for _, service := range services.Services {
-		//ask for confirmation if service is not in service set
 
 		allowedInputsSlice := []string{"y", "n"}
 		allowedInputs := make(map[string]struct{}, len(allowedInputsSlice))

internal/service/client.go

@@ -42,7 +42,7 @@ func grpcClient(ctx *context.Context) (*grpc.ClientConn, *context.Context, error
 	}
 
 	contextWithTrace := context.WithValue(*ctx, constant.TraceIDKey, traceID)
-	conn, err := grpc.Dial(appConfig.BackendAddress, opts...)
+	conn, err := grpc.NewClient(appConfig.BackendAddress, opts...)
 
 	if err != nil {
 		return nil, nil, err

internal/service/service.go

@@ -5,14 +5,15 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"io"
+
 	"github.com/briandowns/spinner"
 	"github.com/dream11/odin/pkg/constant"
 	"github.com/dream11/odin/pkg/util"
 	serviceDto "github.com/dream11/odin/proto/gen/go/dream11/od/dto/v1"
 	serviceProto "github.com/dream11/odin/proto/gen/go/dream11/od/service/v1"
 	"github.com/olekukonko/tablewriter"
 	log "github.com/sirupsen/logrus"
-	"io"
 )
 
 // Service performs operation on service like deploy. undeploy

pkg/util/util.go

@@ -39,24 +39,8 @@ func GenerateResponseMessage(response *v1.ServiceResponse) string {
 // GenerateResponseMessage generate response message from ServiceSetResponse
 func GenerateServiceSetResponseMessage(response *v1.DeployServiceSetServiceResponse) string {
 
-	/*message := fmt.Sprintf("\n Service %s %s %s %s", response.ServiceIdentifier.ServiceName, response.ServiceIdentifier.ServiceVersion, response.ServiceResponse.ServiceStatus.ServiceAction, response.ServiceResponse.ServiceStatus)
-	for _, compMessage := range response.ServiceResponse.ComponentsStatus {
-		message += fmt.Sprintf("\n Component %s %s %s %s", compMessage.ComponentName, compMessage.ComponentAction, compMessage.ComponentStatus, compMessage.Error)
-	}
-	return message*/
-
 	message := fmt.Sprintf("\n Service %s %s %s %s", response.ServiceIdentifier.ServiceName, response.ServiceIdentifier.ServiceVersion, response.ServiceResponse.ServiceStatus.ServiceAction, response.ServiceResponse.ServiceStatus)
 	var tableData [][]string
-
-	/*for _, compMessage := range response.ServiceIdentifier {
-		row := []string{
-			compMessage.ComponentName,
-			compMessage.ComponentAction,
-			compMessage.ComponentStatus,
-			compMessage.Error,
-		}
-		tableData = append(tableData, row)
-	}*/
 	row := []string{
 		response.ServiceIdentifier.ServiceName,
 		response.ServiceIdentifier.ServiceVersion,