Refactor

Author: EyalDelarea

apptrust/commands/flags.go

@@ -81,7 +81,7 @@ var flagsMap = map[string]components.Flag{
 	DryRunFlag:              components.NewBoolFlag(DryRunFlag, "Perform a simulation of the operation.", components.WithBoolDefaultValueFalse()),
 	ExcludeReposFlag:        components.NewStringFlag(ExcludeReposFlag, "Semicolon-separated list of repositories to exclude.", func(f *components.StringFlag) { f.Mandatory = false }),
 	IncludeReposFlag:        components.NewStringFlag(IncludeReposFlag, "Semicolon-separated list of repositories to include.", func(f *components.StringFlag) { f.Mandatory = false }),
-	PropsFlag:               components.NewStringFlag(PropsFlag, "Semicolon-separated list of properties in the format \"key1=value1;key2=value2;...\" to be added to each artifact.", func(f *components.StringFlag) { f.Mandatory = false }),
+	PropsFlag:               components.NewStringFlag(PropsFlag, "Semicolon-separated list of properties in the form of 'key1=value1;key2=value2;...' to be added to each artifact.", func(f *components.StringFlag) { f.Mandatory = false }),
 }
 
 var commandFlags = map[string][]string{

apptrust/commands/version/release_app_version_cmd.go

@@ -17,7 +17,7 @@ import (
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 )
 
-type ReleaseAppVersionCommand struct {
+type releaseAppVersionCommand struct {
 	versionService versions.VersionService
 	serverDetails  *coreConfig.ServerDetails
 	applicationKey string
@@ -26,7 +26,7 @@ type ReleaseAppVersionCommand struct {
 	sync           bool
 }
 
-func (rv *ReleaseAppVersionCommand) Run() error {
+func (rv *releaseAppVersionCommand) Run() error {
 	ctx, err := service.NewContext(*rv.serverDetails)
 	if err != nil {
 		return err
@@ -35,15 +35,15 @@ func (rv *ReleaseAppVersionCommand) Run() error {
 	return rv.versionService.ReleaseAppVersion(ctx, rv.applicationKey, rv.version, rv.requestPayload, rv.sync)
 }
 
-func (rv *ReleaseAppVersionCommand) ServerDetails() (*coreConfig.ServerDetails, error) {
+func (rv *releaseAppVersionCommand) ServerDetails() (*coreConfig.ServerDetails, error) {
 	return rv.serverDetails, nil
 }
 
-func (rv *ReleaseAppVersionCommand) CommandName() string {
+func (rv *releaseAppVersionCommand) CommandName() string {
 	return commands.ReleaseAppVersion
 }
 
-func (rv *ReleaseAppVersionCommand) prepareAndRunCommand(ctx *components.Context) error {
+func (rv *releaseAppVersionCommand) prepareAndRunCommand(ctx *components.Context) error {
 	if len(ctx.Arguments) != 2 {
 		return pluginsCommon.WrongNumberOfArgumentsHandler(ctx)
 	}
@@ -67,7 +67,7 @@ func (rv *ReleaseAppVersionCommand) prepareAndRunCommand(ctx *components.Context
 	return commonCLiCommands.Exec(rv)
 }
 
-func (rv *ReleaseAppVersionCommand) buildRequestPayload(ctx *components.Context) (*model.ReleaseAppVersionRequest, error) {
+func (rv *releaseAppVersionCommand) buildRequestPayload(ctx *components.Context) (*model.ReleaseAppVersionRequest, error) {
 	var includedRepos []string
 	var excludedRepos []string
 	var artifactProps map[string]string
@@ -84,7 +84,7 @@ func (rv *ReleaseAppVersionCommand) buildRequestPayload(ctx *components.Context)
 		var err error
 		artifactProps, err = utils.ParseMapFlag(propsStr)
 		if err != nil {
-			return nil, err
+			return nil, errorutils.CheckErrorf("failed to parse properties: %s", err.Error())
 		}
 	}
 
@@ -109,7 +109,7 @@ func (rv *ReleaseAppVersionCommand) buildRequestPayload(ctx *components.Context)
 }
 
 func GetReleaseAppVersionCommand(appContext app.Context) components.Command {
-	cmd := &ReleaseAppVersionCommand{versionService: appContext.GetVersionService()}
+	cmd := &releaseAppVersionCommand{versionService: appContext.GetVersionService()}
 	return components.Command{
 		Name:        commands.ReleaseAppVersion,
 		Description: "Release application version",

apptrust/commands/version/release_app_version_cmd_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/jfrog/jfrog-cli-application/apptrust/commands"
+	"github.com/jfrog/jfrog-cli-application/apptrust/commands/utils"
 	mockversions "github.com/jfrog/jfrog-cli-application/apptrust/service/versions/mocks"
 	"go.uber.org/mock/gomock"
 
@@ -44,7 +45,7 @@ func TestReleaseAppVersionCommand_Run(t *testing.T) {
 			mockVersionService.EXPECT().ReleaseAppVersion(gomock.Any(), applicationKey, version, requestPayload, tt.sync).
 				Return(nil).Times(1)
 
-			cmd := &ReleaseAppVersionCommand{
+			cmd := &releaseAppVersionCommand{
 				versionService: mockVersionService,
 				serverDetails:  serverDetails,
 				applicationKey: applicationKey,
@@ -91,7 +92,7 @@ func TestReleaseAppVersionCommand_Run_Error(t *testing.T) {
 			mockVersionService.EXPECT().ReleaseAppVersion(gomock.Any(), applicationKey, version, requestPayload, tt.sync).
 				Return(expectedError).Times(1)
 
-			cmd := &ReleaseAppVersionCommand{
+			cmd := &releaseAppVersionCommand{
 				versionService: mockVersionService,
 				serverDetails:  serverDetails,
 				applicationKey: applicationKey,
@@ -112,7 +113,7 @@ func TestReleaseAppVersionCommand_ServerDetails(t *testing.T) {
 	defer ctrl.Finish()
 
 	serverDetails := &config.ServerDetails{}
-	cmd := &ReleaseAppVersionCommand{
+	cmd := &releaseAppVersionCommand{
 		serverDetails: serverDetails,
 	}
 
@@ -125,6 +126,55 @@ func TestReleaseAppVersionCommand_CommandName(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	cmd := &ReleaseAppVersionCommand{}
+	cmd := &releaseAppVersionCommand{}
 	assert.Equal(t, commands.ReleaseAppVersion, cmd.CommandName())
 }
+
+func TestReleaseAppVersionCommand_BuildRequestPayload(t *testing.T) {
+	// Test the key validation logic used in buildRequestPayload
+	t.Run("validation test", func(t *testing.T) {
+		// Let's define the actual allowed values for promotion type
+		allowedValues := []string{model.PromotionTypeCopy, model.PromotionTypeMove}
+
+		// Case 1: Empty string should return the default value
+		result1, err1 := utils.ValidateEnumFlag(
+			"test-flag",
+			"",
+			model.PromotionTypeCopy,
+			allowedValues)
+
+		assert.NoError(t, err1)
+		assert.Equal(t, model.PromotionTypeCopy, result1)
+
+		// Case 2: Valid value should be returned as is
+		result2, err2 := utils.ValidateEnumFlag(
+			"test-flag",
+			model.PromotionTypeMove,
+			model.PromotionTypeCopy,
+			allowedValues)
+
+		assert.NoError(t, err2)
+		assert.Equal(t, model.PromotionTypeMove, result2)
+
+		// Case 3: Invalid value should return an error
+		result3, err3 := utils.ValidateEnumFlag(
+			"test-flag",
+			"invalid-type",
+			model.PromotionTypeCopy,
+			allowedValues)
+
+		assert.Error(t, err3)
+		assert.Equal(t, "", result3) // On error, the result is empty
+		assert.Contains(t, err3.Error(), "invalid value")
+	})
+
+	t.Run("property parsing test", func(t *testing.T) {
+		// Test property parsing behavior
+		props, err := utils.ParseMapFlag("key1=value1;key2=value2")
+		assert.NoError(t, err)
+		assert.Equal(t, map[string]string{"key1": "value1", "key2": "value2"}, props)
+
+		_, err = utils.ParseMapFlag("invalid-format")
+		assert.Error(t, err)
+	})
+}