CR

Author: EyalDelarea

apptrust/commands/version/promote_app_version_cmd_test.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/jfrog/jfrog-cli-application/apptrust/commands"
 	mockversions "github.com/jfrog/jfrog-cli-application/apptrust/service/versions/mocks"
 	"go.uber.org/mock/gomock"
 
@@ -69,11 +68,10 @@ func TestPromoteAppVersionCommand_Run_Error(t *testing.T) {
 	requestPayload := &model.PromoteAppVersionRequest{
 		Stage: "prod",
 	}
-	sync := true
 	expectedError := errors.New("service error occurred")
 
 	mockVersionService := mockversions.NewMockVersionService(ctrl)
-	mockVersionService.EXPECT().PromoteAppVersion(gomock.Any(), applicationKey, version, requestPayload, sync).
+	mockVersionService.EXPECT().PromoteAppVersion(gomock.Any(), applicationKey, version, requestPayload, false).
 		Return(expectedError).Times(1)
 
 	cmd := &promoteAppVersionCommand{
@@ -82,32 +80,10 @@ func TestPromoteAppVersionCommand_Run_Error(t *testing.T) {
 		applicationKey: applicationKey,
 		version:        version,
 		requestPayload: requestPayload,
-		sync:           sync,
+		sync:           false,
 	}
 
 	err := cmd.Run()
 	assert.Error(t, err)
 	assert.Contains(t, err.Error(), "service error occurred")
 }
-
-func TestPromoteAppVersionCommand_ServerDetails(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	serverDetails := &config.ServerDetails{}
-	cmd := &promoteAppVersionCommand{
-		serverDetails: serverDetails,
-	}
-
-	details, err := cmd.ServerDetails()
-	assert.NoError(t, err)
-	assert.Equal(t, serverDetails, details)
-}
-
-func TestPromoteAppVersionCommand_CommandName(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	cmd := &promoteAppVersionCommand{}
-	assert.Equal(t, commands.VersionPromote, cmd.CommandName())
-}

apptrust/commands/version/release_app_version_cmd_test.go

@@ -5,7 +5,6 @@ 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"
 
@@ -64,54 +63,36 @@ func TestReleaseAppVersionCommand_Run(t *testing.T) {
 }
 
 func TestReleaseAppVersionCommand_Run_Error(t *testing.T) {
-	tests := []struct {
-		name string
-		sync bool
-	}{
-		{
-			name: "sync flag true - error",
-			sync: true,
-		},
-		{
-			name: "sync flag false - error",
-			sync: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			ctrl := gomock.NewController(t)
-			defer ctrl.Finish()
-
-			serverDetails := &config.ServerDetails{Url: "https://example.com"}
-			applicationKey := "app-key"
-			version := "1.0.0"
-			requestPayload := model.NewReleaseAppVersionRequest(
-				model.PromotionTypeCopy,
-				nil, // includedRepos
-				nil, // excludedRepos
-				nil, // artifactProps
-			)
-			expectedError := errors.New("service error occurred")
-
-			mockVersionService := mockversions.NewMockVersionService(ctrl)
-			mockVersionService.EXPECT().ReleaseAppVersion(gomock.Any(), applicationKey, version, requestPayload, tt.sync).
-				Return(expectedError).Times(1)
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
 
-			cmd := &releaseAppVersionCommand{
-				versionService: mockVersionService,
-				serverDetails:  serverDetails,
-				applicationKey: applicationKey,
-				version:        version,
-				requestPayload: requestPayload,
-				sync:           tt.sync,
-			}
+	serverDetails := &config.ServerDetails{Url: "https://example.com"}
+	applicationKey := "app-key"
+	version := "1.0.0"
+	requestPayload := model.NewReleaseAppVersionRequest(
+		model.PromotionTypeCopy,
+		nil, // includedRepos
+		nil, // excludedRepos
+		nil, // artifactProps
+	)
+	expectedError := errors.New("service error occurred")
+
+	mockVersionService := mockversions.NewMockVersionService(ctrl)
+	mockVersionService.EXPECT().ReleaseAppVersion(gomock.Any(), applicationKey, version, requestPayload, false).
+		Return(expectedError).Times(1)
 
-			err := cmd.Run()
-			assert.Error(t, err)
-			assert.Contains(t, err.Error(), "service error occurred")
-		})
+	cmd := &releaseAppVersionCommand{
+		versionService: mockVersionService,
+		serverDetails:  serverDetails,
+		applicationKey: applicationKey,
+		version:        version,
+		requestPayload: requestPayload,
+		sync:           false,
 	}
+
+	err := cmd.Run()
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "service error occurred")
 }
 
 func TestReleaseAppVersionCommand_ServerDetails(t *testing.T) {
@@ -135,52 +116,3 @@ func TestReleaseAppVersionCommand_CommandName(t *testing.T) {
 	cmd := &releaseAppVersionCommand{}
 	assert.Equal(t, commands.VersionRelease, 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)
-	})
-}

apptrust/commands/version/version_utils.go

@@ -22,14 +22,9 @@ func BuildPromotionParams(ctx *components.Context) (string, []string, []string,
 		excludedRepos = utils.ParseSliceFlag(excludeReposStr)
 	}
 
-	// Validate promotion type flag
 	promotionType := ctx.GetStringFlagValue(commands.PromotionTypeFlag)
 
-	// For validation, we need to add the dry_run option
-	allowedValues := append([]string{}, model.PromotionTypeValues...)
-	allowedValues = append(allowedValues, model.PromotionTypeDryRun)
-
-	validatedPromotionType, err := utils.ValidateEnumFlag(commands.PromotionTypeFlag, promotionType, model.PromotionTypeCopy, allowedValues)
+	validatedPromotionType, err := utils.ValidateEnumFlag(commands.PromotionTypeFlag, promotionType, model.PromotionTypeCopy, model.PromotionTypeValues)
 	if err != nil {
 		return "", nil, nil, err
 	}

apptrust/model/release_app_version_request.go

@@ -1,7 +1,7 @@
 package model
 
 const (
-	ReleaseStage = "RELEASE"
+	ReleaseStage = "PROD"
 )
 
 type ReleaseAppVersionRequest struct {