refactor

Author: EyalDelarea

apptrust/commands/flags.go

@@ -95,8 +95,8 @@ var flagsMap = map[string]components.Flag{
 	ReleaseBundlesFlag:      components.NewStringFlag(ReleaseBundlesFlag, "List of release bundles in format 'name1:version1;name2:version2'", func(f *components.StringFlag) { f.Mandatory = false }),
 	SourceVersionFlag:       components.NewStringFlag(SourceVersionFlag, "Source versions in format 'app1:version1;app2:version2'", func(f *components.StringFlag) { f.Mandatory = false }),
 	PackagesFlag:            components.NewStringFlag(PackagesFlag, "List of packages in format 'name1;name2'", func(f *components.StringFlag) { f.Mandatory = false }),
-	PropertiesFlag:          components.NewStringFlag(PropertiesFlag, "Sets or updates a custom property for the application version in format 'key=value1[,value2,...]'", func(f *components.StringFlag) { f.Mandatory = false }),
-	DeletePropertyFlag:      components.NewStringFlag(DeletePropertyFlag, "Completely removes the specified property key and all its associated values from the application version", func(f *components.StringFlag) { f.Mandatory = false }),
+	PropertiesFlag:          components.NewStringFlag(PropertiesFlag, "Set or update a property: 'key=val1[,val2,...]'", func(f *components.StringFlag) { f.Mandatory = false }),
+	DeletePropertyFlag:      components.NewStringFlag(DeletePropertyFlag, "Remove a property key and all its values", func(f *components.StringFlag) { f.Mandatory = false }),
 }
 
 var commandFlags = map[string][]string{

apptrust/commands/version/update_app_version_cmd.go

@@ -58,15 +58,11 @@ func (uv *updateAppVersionCommand) prepareAndRunCommand(ctx *components.Context)
 		return pluginsCommon.WrongNumberOfArgumentsHandler(ctx)
 	}
 
-	uv.applicationKey = ctx.Arguments[0]
-	uv.version = ctx.Arguments[1]
-
-	serverDetails, err := utils.ServerDetailsByFlags(ctx)
-	if err != nil {
+	if err := uv.parseFlagsAndSetFields(ctx); err != nil {
 		return err
 	}
-	uv.serverDetails = serverDetails
 
+	var err error
 	uv.requestPayload, err = uv.buildRequestPayload(ctx)
 	if errorutils.CheckError(err) != nil {
 		return err
@@ -75,6 +71,19 @@ func (uv *updateAppVersionCommand) prepareAndRunCommand(ctx *components.Context)
 	return commonCLiCommands.Exec(uv)
 }
 
+// parseFlagsAndSetFields parses CLI flags and sets struct fields accordingly.
+func (uv *updateAppVersionCommand) parseFlagsAndSetFields(ctx *components.Context) error {
+	uv.applicationKey = ctx.Arguments[0]
+	uv.version = ctx.Arguments[1]
+
+	serverDetails, err := utils.ServerDetailsByFlags(ctx)
+	if err != nil {
+		return err
+	}
+	uv.serverDetails = serverDetails
+	return nil
+}
+
 func (uv *updateAppVersionCommand) buildRequestPayload(ctx *components.Context) (*model.UpdateAppVersionRequest, error) {
 	request := &model.UpdateAppVersionRequest{
 		ApplicationKey: uv.applicationKey,

apptrust/service/versions/version_service.go

@@ -93,22 +93,10 @@ func (vs *versionService) UpdateAppVersion(ctx service.Context, request *model.U
 		return err
 	}
 
-	switch response.StatusCode {
-	case http.StatusAccepted:
-		return nil
-	case http.StatusBadRequest:
-		return fmt.Errorf("bad request - invalid update data. Status code: %d. \n%s", response.StatusCode, responseBody)
-	case http.StatusUnauthorized:
-		return fmt.Errorf("unauthorized - authentication required. Status code: %d. \n%s", response.StatusCode, responseBody)
-	case http.StatusForbidden:
-		return fmt.Errorf("forbidden - insufficient permissions. Status code: %d. \n%s", response.StatusCode, responseBody)
-	case http.StatusNotFound:
-		return fmt.Errorf("application version not found. Status code: %d. \n%s", response.StatusCode, responseBody)
-	case http.StatusConflict:
-		return fmt.Errorf("conflict - version update conflicts with current state. Status code: %d. \n%s", response.StatusCode, responseBody)
-	case http.StatusUnprocessableEntity:
-		return fmt.Errorf("unprocessable entity - validation failed. Status code: %d. \n%s", response.StatusCode, responseBody)
-	default:
-		return fmt.Errorf("failed to update app version. Status code: %d. \n%s", response.StatusCode, responseBody)
+	if response.StatusCode != http.StatusAccepted {
+		return fmt.Errorf("failed to update app version. Status code: %d. \n%s",
+			response.StatusCode, responseBody)
 	}
+
+	return nil
 }

apptrust/service/versions/version_service_test.go

@@ -378,7 +378,7 @@ func TestUpdateAppVersion(t *testing.T) {
 			mockResponseBody: "bad request",
 			mockError:        nil,
 			expectError:      true,
-			errorMsg:         "bad request - invalid update data",
+			errorMsg:         "failed to update app version",
 		},
 		{
 			name: "failure - 404",
@@ -391,7 +391,7 @@ func TestUpdateAppVersion(t *testing.T) {
 			mockResponseBody: "not found",
 			mockError:        nil,
 			expectError:      true,
-			errorMsg:         "application version not found",
+			errorMsg:         "failed to update app version",
 		},
 		{
 			name: "http client error",