cr

Author: EyalDelarea

apptrust/commands/flags.go

@@ -90,12 +90,12 @@ var flagsMap = map[string]components.Flag{
 	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 form of 'key1=value1;key2=value2;...' to be added to each artifact.", func(f *components.StringFlag) { f.Mandatory = false }),
-	TagFlag:                 components.NewStringFlag(TagFlag, "A tag to associate with the version. Must contain only alphanumeric characters, hyphens (-), underscores (_), and dots (.). Examples: 'release-1.2.3', 'v1.0.0', 'production_build'.", func(f *components.StringFlag) { f.Mandatory = false }),
+	TagFlag:                 components.NewStringFlag(TagFlag, "A tag to associate with the version. Must contain only alphanumeric characters, hyphens (-), underscores (_), and dots (.).", func(f *components.StringFlag) { f.Mandatory = false }),
 	BuildsFlag:              components.NewStringFlag(BuildsFlag, "List of builds in format 'name1:number1[:timestamp1];name2:number2[:timestamp2]'", func(f *components.StringFlag) { f.Mandatory = false }),
 	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, "Set or update a property: 'key=val1[,val2,...]'", 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 }),
 }
 

apptrust/commands/utils/utils.go

@@ -137,14 +137,14 @@ func ParseNameVersionPairs(input string) ([][2]string, error) {
 	return result, nil
 }
 
-// ParsePropertiesFlag parses a properties string into a map of keys to value slices.
+// ParseListPropertiesFlag parses a properties string into a map of keys to value slices.
 // Format: "key1=value1[,value2,...];key2=value3[,value4,...]"
 // Examples:
 //   - "status=rc" -> {"status": ["rc"]}
 //   - "status=rc,validated" -> {"status": ["rc", "validated"]}
 //   - "status=rc;deployed_to=staging" -> {"status": ["rc"], "deployed_to": ["staging"]}
 //   - "old_flag=" -> {"old_flag": []} (clears values)
-func ParsePropertiesFlag(propertiesStr string) (map[string][]string, error) {
+func ParseListPropertiesFlag(propertiesStr string) (map[string][]string, error) {
 	if propertiesStr == "" {
 		return nil, nil
 	}
@@ -171,6 +171,9 @@ func ParsePropertiesFlag(propertiesStr string) (map[string][]string, error) {
 			for i, v := range values {
 				values[i] = strings.TrimSpace(v)
 			}
+		} else {
+			// Return empty slice instead of nil for empty values
+			values = []string{}
 		}
 		// Always set the key, even with empty values (to clear values)
 		result[key] = values

apptrust/commands/utils/utils_test.go

@@ -197,82 +197,3 @@ func TestParseNameVersionPairs(t *testing.T) {
 		})
 	}
 }
-
-func TestParsePropertiesFlag(t *testing.T) {
-	tests := []struct {
-		name      string
-		input     string
-		expected  map[string][]string
-		expectErr bool
-	}{
-		{
-			name:     "empty string",
-			input:    "",
-			expected: nil,
-		},
-		{
-			name:  "single property with single value",
-			input: "status=rc",
-			expected: map[string][]string{
-				"status": {"rc"},
-			},
-		},
-		{
-			name:  "single property with multiple values",
-			input: "status=rc,validated",
-			expected: map[string][]string{
-				"status": {"rc", "validated"},
-			},
-		},
-		{
-			name:  "multiple properties",
-			input: "status=rc,validated;deployed_to=staging-A,staging-B",
-			expected: map[string][]string{
-				"status":      {"rc", "validated"},
-				"deployed_to": {"staging-A", "staging-B"},
-			},
-		},
-		{
-			name:  "empty values (clears values)",
-			input: "old_feature_flag=",
-			expected: map[string][]string{
-				"old_feature_flag": nil,
-			},
-		},
-		{
-			name:  "with spaces",
-			input: " status = rc , validated ; deployed_to = staging-A , staging-B ",
-			expected: map[string][]string{
-				"status":      {"rc", "validated"},
-				"deployed_to": {"staging-A", "staging-B"},
-			},
-		},
-		{
-			name:      "invalid format - missing =",
-			input:     "invalid-format",
-			expectErr: true,
-		},
-		{
-			name:      "empty key",
-			input:     "=value",
-			expectErr: true,
-		},
-		{
-			name:      "empty key with spaces",
-			input:     " =value",
-			expectErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result, err := ParsePropertiesFlag(tt.input)
-			if tt.expectErr {
-				assert.Error(t, err)
-			} else {
-				assert.NoError(t, err)
-				assert.Equal(t, tt.expected, result)
-			}
-		})
-	}
-}

apptrust/commands/version/update_app_version_cmd.go

@@ -96,7 +96,7 @@ func (uv *updateAppVersionCommand) buildRequestPayload(ctx *components.Context)
 
 	// Handle properties - use spec format: key=value1[,value2,...]
 	if ctx.IsFlagSet(commands.PropertiesFlag) {
-		properties, err := utils.ParsePropertiesFlag(ctx.GetStringFlagValue(commands.PropertiesFlag))
+		properties, err := utils.ParseListPropertiesFlag(ctx.GetStringFlagValue(commands.PropertiesFlag))
 		if err != nil {
 			return nil, err
 		}

apptrust/commands/version/update_app_version_cmd_test.go

@@ -163,7 +163,7 @@ func TestUpdateAppVersionCommand_FlagsSuite(t *testing.T) {
 				ApplicationKey: "app-key",
 				Version:        "1.0.0",
 				Properties: map[string][]string{
-					"old_feature_flag": nil,
+					"old_feature_flag": {},
 				},
 			},
 		},
@@ -292,7 +292,7 @@ func TestParseProperties(t *testing.T) {
 			name:  "empty values (clears values)",
 			input: "old_feature_flag=",
 			expected: map[string][]string{
-				"old_feature_flag": nil,
+				"old_feature_flag": {},
 			},
 		},
 		{
@@ -322,7 +322,7 @@ func TestParseProperties(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			result, err := utils.ParsePropertiesFlag(tt.input)
+			result, err := utils.ParseListPropertiesFlag(tt.input)
 			if tt.expectErr {
 				assert.Error(t, err)
 			} else {