Merge remote-tracking branch 'origin/APP-440-Create-application-descriptor' into APP-443-Update-specific-application

Author: asafgabai

application/commands/application/create_app_cmd.go

@@ -1,8 +1,6 @@
 package application
 
 import (
-	"slices"
-
 	pluginsCommon "github.com/jfrog/jfrog-cli-core/v2/plugins/common"
 
 	"github.com/jfrog/jfrog-cli-application/application/commands/utils"
@@ -11,7 +9,6 @@ import (
 	commonCLiCommands "github.com/jfrog/jfrog-cli-core/v2/common/commands"
 	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
 	coreConfig "github.com/jfrog/jfrog-cli-core/v2/utils/config"
-	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 
 	"github.com/jfrog/jfrog-cli-application/application/app"
@@ -56,20 +53,24 @@ func (cac *createAppCommand) buildRequestPayload(ctx *components.Context) (*mode
 		return nil, errorutils.CheckErrorf("--%s is mandatory", commands.ProjectFlag)
 	}
 
-	businessCriticality := ctx.GetStringFlagValue(commands.BusinessCriticalityFlag)
-	if businessCriticality == "" {
-		// Default to "unspecified" if not provided
-		businessCriticality = model.BusinessCriticalityUnspecified
-	} else if !slices.Contains(model.BusinessCriticalityValues, businessCriticality) {
-		return nil, errorutils.CheckErrorf("invalid value for --%s: '%s'. Allowed values: %s", commands.BusinessCriticalityFlag, businessCriticality, coreutils.ListToText(model.BusinessCriticalityValues))
+	businessCriticalityStr := ctx.GetStringFlagValue(commands.BusinessCriticalityFlag)
+	businessCriticality, err := utils.ValidateEnumFlag(
+		commands.BusinessCriticalityFlag,
+		businessCriticalityStr,
+		model.BusinessCriticalityUnspecified,
+		model.BusinessCriticalityValues)
+	if err != nil {
+		return nil, err
 	}
 
-	maturityLevel := ctx.GetStringFlagValue(commands.MaturityLevelFlag)
-	if maturityLevel == "" {
-		// Default to "unspecified" if not provided
-		maturityLevel = model.MaturityLevelUnspecified
-	} else if !slices.Contains(model.MaturityLevelValues, maturityLevel) {
-		return nil, errorutils.CheckErrorf("invalid value for --%s: '%s'. Allowed values: %s", commands.MaturityLevelFlag, maturityLevel, coreutils.ListToText(model.MaturityLevelValues))
+	maturityLevelStr := ctx.GetStringFlagValue(commands.MaturityLevelFlag)
+	maturityLevel, err := utils.ValidateEnumFlag(
+		commands.MaturityLevelFlag,
+		maturityLevelStr,
+		model.MaturityLevelUnspecified,
+		model.MaturityLevelValues)
+	if err != nil {
+		return nil, err
 	}
 
 	description := ctx.GetStringFlagValue(commands.DescriptionFlag)

application/commands/utils/utils.go

@@ -2,12 +2,14 @@ package utils
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 
 	commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils"
 	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-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 )
 
@@ -63,3 +65,19 @@ func ParseMapFlag(flagValue string) (map[string]string, error) {
 	}
 	return result, nil
 }
+
+// ValidateEnumFlag validates that a flag value is in the list of allowed values.
+// If the value is empty, returns the default value.
+// Otherwise, returns an error if the value is not in the allowed values.
+func ValidateEnumFlag(flagName, value string, defaultValue string, allowedValues []string) (string, error) {
+	if value == "" {
+		return defaultValue, nil
+	}
+
+	if slices.Contains(allowedValues, value) {
+		return value, nil
+	}
+
+	return "", errorutils.CheckErrorf("invalid value for --%s: '%s'. Allowed values: %s",
+		flagName, value, coreutils.ListToText(allowedValues))
+}

application/commands/utils/utils_test.go

@@ -53,3 +53,64 @@ func TestParseMapFlag(t *testing.T) {
 		})
 	}
 }
+
+func TestValidateEnumFlag(t *testing.T) {
+	tests := []struct {
+		name          string
+		flagName      string
+		value         string
+		validValues   []string
+		defaultValue  string
+		expectError   bool
+		expectedValue string
+	}{
+		{
+			name:          "valid value",
+			flagName:      "test-flag",
+			value:         "foo",
+			validValues:   []string{"foo", "bar", "baz"},
+			defaultValue:  "",
+			expectError:   false,
+			expectedValue: "foo",
+		},
+		{
+			name:          "invalid value with default",
+			flagName:      "test-flag",
+			value:         "invalid",
+			validValues:   []string{"foo", "bar", "baz"},
+			defaultValue:  "bar",
+			expectError:   true,
+			expectedValue: "",
+		},
+		{
+			name:          "invalid value without default",
+			flagName:      "test-flag",
+			value:         "invalid",
+			validValues:   []string{"foo", "bar", "baz"},
+			defaultValue:  "",
+			expectError:   true,
+			expectedValue: "",
+		},
+		{
+			name:          "empty value with default",
+			flagName:      "test-flag",
+			value:         "",
+			validValues:   []string{"foo", "bar", "baz"},
+			defaultValue:  "baz",
+			expectError:   false,
+			expectedValue: "baz",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result, err := ValidateEnumFlag(tt.flagName, tt.value, tt.defaultValue, tt.validValues)
+			if tt.expectError {
+				assert.Error(t, err, "ValidateEnumFlag(%q) expected error, got nil", tt.value)
+				return
+			}
+			assert.NoError(t, err, "ValidateEnumFlag(%q) unexpected error: %v", tt.value, err)
+			assert.Equal(t, tt.expectedValue, result, "ValidateEnumFlag(%q) = %v, want %v", tt.value, result, tt.expectedValue)
+		})
+	}
+}