CR

Author: EyalDelarea

apptrust/commands/flags.go

@@ -52,7 +52,6 @@ const (
 	SourceTypeApplicationVersionsFlag = "source-type-application-versions"
 	PropertiesFlag                    = "properties"
 	DeletePropertyFlag                = "delete-property"
-	FromStageFlag                     = "from-stage"
 )
 
 // Flag keys mapped to their corresponding components.Flag definition.
@@ -87,7 +86,6 @@ var flagsMap = map[string]components.Flag{
 	SourceTypeApplicationVersionsFlag: components.NewStringFlag(SourceTypeApplicationVersionsFlag, "List of semicolon-separated (;) application versions in the form of 'application-key=app1, version=version1; application-key=app2, version=version2' to be included in the new version.", func(f *components.StringFlag) { f.Mandatory = false }),
 	PropertiesFlag:                    components.NewStringFlag(PropertiesFlag, "Sets or updates custom properties for the application version in format 'key1=value1[,value2,...];key2=value3[,value4,...]'", 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 }),
-	FromStageFlag:                     components.NewStringFlag(FromStageFlag, "The name of the stage from which to roll back the application version.", func(f *components.StringFlag) { f.Mandatory = true }),
 }
 
 var commandFlags = map[string][]string{
@@ -137,7 +135,6 @@ var commandFlags = map[string][]string{
 		user,
 		accessToken,
 		serverId,
-		FromStageFlag,
 	},
 	VersionUpdate: {
 		url,

apptrust/commands/version/rollback_app_version_cmd.go

@@ -14,7 +14,6 @@ import (
 	pluginsCommon "github.com/jfrog/jfrog-cli-core/v2/plugins/common"
 	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
 	coreConfig "github.com/jfrog/jfrog-cli-core/v2/utils/config"
-	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 )
 
 type rollbackAppVersionCommand struct {
@@ -23,6 +22,7 @@ type rollbackAppVersionCommand struct {
 	applicationKey string
 	version        string
 	requestPayload *model.RollbackAppVersionRequest
+	fromStage      string
 }
 
 func (rv *rollbackAppVersionCommand) Run() error {
@@ -43,24 +43,20 @@ func (rv *rollbackAppVersionCommand) CommandName() string {
 }
 
 func (rv *rollbackAppVersionCommand) prepareAndRunCommand(ctx *components.Context) error {
-	if len(ctx.Arguments) != 2 {
+	if len(ctx.Arguments) != 3 {
 		return pluginsCommon.WrongNumberOfArgumentsHandler(ctx)
 	}
 
 	rv.applicationKey = ctx.Arguments[0]
 	rv.version = ctx.Arguments[1]
-
-	fromStage := ctx.GetStringFlagValue(commands.FromStageFlag)
-	if fromStage == "" {
-		return errorutils.CheckErrorf("the --%s flag is required", commands.FromStageFlag)
-	}
+	rv.fromStage = ctx.Arguments[2]
 
 	serverDetails, err := utils.ServerDetailsByFlags(ctx)
 	if err != nil {
 		return err
 	}
 	rv.serverDetails = serverDetails
-	rv.requestPayload = model.NewRollbackAppVersionRequest(fromStage)
+	rv.requestPayload = model.NewRollbackAppVersionRequest(rv.fromStage)
 
 	return commonCLiCommands.Exec(rv)
 }

apptrust/commands/version/rollback_app_version_cmd_test.go

@@ -69,19 +69,3 @@ func TestRollbackAppVersionCommand_Run_Error(t *testing.T) {
 	assert.Error(t, err)
 	assert.Contains(t, err.Error(), "rollback service error occurred")
 }
-
-func TestRollbackAppVersionCommand_CommandName(t *testing.T) {
-	cmd := &rollbackAppVersionCommand{}
-	assert.Equal(t, "version-rollback", cmd.CommandName())
-}
-
-func TestRollbackAppVersionCommand_ServerDetails(t *testing.T) {
-	serverDetails := &config.ServerDetails{Url: "https://example.com"}
-	cmd := &rollbackAppVersionCommand{
-		serverDetails: serverDetails,
-	}
-
-	result, err := cmd.ServerDetails()
-	assert.NoError(t, err)
-	assert.Equal(t, serverDetails, result)
-}

apptrust/service/versions/version_service.go

@@ -79,7 +79,7 @@ func (vs *versionService) RollbackAppVersion(ctx service.Context, applicationKey
 		return err
 	}
 
-	if response.StatusCode != http.StatusOK && response.StatusCode != http.StatusNoContent {
+	if response.StatusCode != http.StatusOK && response.StatusCode != http.StatusAccepted {
 		return fmt.Errorf("failed to rollback app version. Status code: %d. \n%s",
 			response.StatusCode, responseBody)
 	}

apptrust/service/versions/version_service_test.go

@@ -444,7 +444,7 @@ func TestRollbackAppVersion(t *testing.T) {
 				FromStage: "prod",
 				Async:     false,
 			},
-			expectedStatus: http.StatusNoContent,
+			expectedStatus: http.StatusAccepted,
 			expectedError:  false,
 		},
 		{
@@ -458,28 +458,6 @@ func TestRollbackAppVersion(t *testing.T) {
 			expectedStatus: http.StatusBadRequest,
 			expectedError:  true,
 		},
-		{
-			name:           "failed rollback - unauthorized",
-			applicationKey: "video-encoder",
-			version:        "1.5.0",
-			payload: &model.RollbackAppVersionRequest{
-				FromStage: "qa",
-				Async:     false,
-			},
-			expectedStatus: http.StatusUnauthorized,
-			expectedError:  true,
-		},
-		{
-			name:           "failed rollback - not found",
-			applicationKey: "nonexistent-app",
-			version:        "1.0.0",
-			payload: &model.RollbackAppVersionRequest{
-				FromStage: "qa",
-				Async:     false,
-			},
-			expectedStatus: http.StatusNotFound,
-			expectedError:  true,
-		},
 	}
 
 	for _, tt := range tests {