Add test cases and implementation for removing flag and value

Author: milldr

pkg/utils/slice_test.go

@@ -150,3 +150,105 @@ func TestSliceRemoveFlag(t *testing.T) {
 		})
 	}
 }
+
+func TestSliceRemoveFlagAndValue(t *testing.T) {
+	testCases := []struct {
+		name     string
+		input    []string
+		flagName string
+		expected []string
+	}{
+		{
+			name:     "remove flag without value",
+			input:    []string{"--flag1", "value1", "--flag2", "value2"},
+			flagName: "flag1",
+			expected: []string{"--flag2", "value2"},
+		},
+		{
+			name:     "remove flag with spaced value",
+			input:    []string{"--flag1", "value1", "--flag2", "value2"},
+			flagName: "flag1",
+			expected: []string{"--flag2", "value2"},
+		},
+		{
+			name:     "remove flag with equals value",
+			input:    []string{"--flag1=value1", "--flag2", "value2"},
+			flagName: "flag1",
+			expected: []string{"--flag2", "value2"},
+		},
+		{
+			name:     "remove flag with spaced value followed by another flag",
+			input:    []string{"--flag1", "value1", "--flag2", "value2"},
+			flagName: "flag1",
+			expected: []string{"--flag2", "value2"},
+		},
+		{
+			name:     "remove flag with spaced value followed by non-flag",
+			input:    []string{"--flag1", "value1", "other", "args"},
+			flagName: "flag1",
+			expected: []string{"other", "args"},
+		},
+		{
+			name:     "remove flag with spaced value followed by another flag",
+			input:    []string{"--flag1", "value1", "--flag2", "value2"},
+			flagName: "flag1",
+			expected: []string{"--flag2", "value2"},
+		},
+		{
+			name:     "remove multiple occurrences",
+			input:    []string{"--flag1", "value1", "--flag1", "value2", "other"},
+			flagName: "flag1",
+			expected: []string{"other"},
+		},
+		{
+			name:     "flag not present",
+			input:    []string{"--flag1", "value1", "--flag2", "value2"},
+			flagName: "flag3",
+			expected: []string{"--flag1", "value1", "--flag2", "value2"},
+		},
+		{
+			name:     "empty slice",
+			input:    []string{},
+			flagName: "flag1",
+			expected: []string{},
+		},
+		{
+			name:     "nil slice",
+			input:    nil,
+			flagName: "flag1",
+			expected: nil,
+		},
+		{
+			name:     "empty flag name",
+			input:    []string{"--flag1", "value1"},
+			flagName: "",
+			expected: []string{"--flag1", "value1"},
+		},
+		{
+			name:     "flag at end without value",
+			input:    []string{"other", "--flag1"},
+			flagName: "flag1",
+			expected: []string{"other"},
+		},
+		{
+			name:     "flag at end with value",
+			input:    []string{"other", "--flag1", "value1"},
+			flagName: "flag1",
+			expected: []string{"other"},
+		},
+		{
+			name:     "mixed flag forms",
+			input:    []string{"--flag1", "value1", "--flag1=value2", "other"},
+			flagName: "flag1",
+			expected: []string{"other"},
+		},
+	}
+
+	for _, tc := range testCases {
+		tc := tc // rebind to avoid range-variable capture
+		t.Run(tc.name, func(t *testing.T) {
+			result := SliceRemoveFlagAndValue(tc.input, tc.flagName)
+			assert.Equal(t, tc.expected, result)
+		})
+	}
+}

pkg/utils/slice_utils.go

@@ -6,13 +6,13 @@ import (
 	"strings"
 )
 
-// Package-level sentinel errors for slice operations
+// Package-level sentinel errors for slice operations.
 var (
 	ErrNilInput         = errors.New("input must not be nil")
 	ErrNonStringElement = errors.New("element is not a string")
 )
 
-// SliceContainsString checks if a string is present in a slice
+// SliceContainsString checks if a string is present in a slice.
 func SliceContainsString(s []string, str string) bool {
 	for _, v := range s {
 		if v == str {
@@ -22,7 +22,7 @@ func SliceContainsString(s []string, str string) bool {
 	return false
 }
 
-// SliceContainsInt checks if an int is present in a slice
+// SliceContainsInt checks if an int is present in a slice.
 func SliceContainsInt(s []int, i int) bool {
 	for _, v := range s {
 		if v == i {
@@ -32,7 +32,7 @@ func SliceContainsInt(s []int, i int) bool {
 	return false
 }
 
-// SliceContainsStringStartsWith checks if a slice contains a string that the given string begins with
+// SliceContainsStringStartsWith checks if a slice contains a string that the given string begins with.
 func SliceContainsStringStartsWith(s []string, str string) bool {
 	for _, v := range s {
 		if strings.HasPrefix(str, v) {
@@ -42,7 +42,7 @@ func SliceContainsStringStartsWith(s []string, str string) bool {
 	return false
 }
 
-// SliceContainsStringHasPrefix checks if a slice contains a string that begins with the given prefix
+// SliceContainsStringHasPrefix checks if a slice contains a string that begins with the given prefix.
 func SliceContainsStringHasPrefix(s []string, prefix string) bool {
 	for _, v := range s {
 		if strings.HasPrefix(v, prefix) {
@@ -95,7 +95,10 @@ func SliceOfInterfacesToSliceOfStringsWithTypeAssertion(input []any) ([]string,
 func SliceRemoveString(slice []string, str string) []string {
 	for i, v := range slice {
 		if v == str {
-			return append(slice[:i], slice[i+1:]...)
+			// Avoid retaining reference to the removed element.
+			copy(slice[i:], slice[i+1:])
+			slice[len(slice)-1] = ""
+			return slice[:len(slice)-1]
 		}
 	}
 	return slice
@@ -108,16 +111,20 @@ func SliceRemoveFlag(slice []string, flagName string) []string {
 	if slice == nil {
 		return nil
 	}
+	if flagName == "" {
+		// No-op for empty flag names.
+		return append([]string(nil), slice...)
+	}
 
 	result := make([]string, 0, len(slice))
 	flagPrefix := "--" + flagName + "="
 
 	for _, item := range slice {
-		// Skip exact flag matches (--flag)
+		// Skip exact flag matches (--flag).
 		if item == "--"+flagName {
 			continue
 		}
-		// Skip flag with value matches (--flag=value)
+		// Skip flag with value matches (--flag=value).
 		if strings.HasPrefix(item, flagPrefix) {
 			continue
 		}
@@ -126,3 +133,27 @@ func SliceRemoveFlag(slice []string, flagName string) []string {
 
 	return result
 }
+
+// SliceRemoveFlagAndValue removes --flag and an optional following value (if the next arg
+// does not start with "-"). It preserves order of remaining args.
+func SliceRemoveFlagAndValue(args []string, flagName string) []string {
+	if args == nil || flagName == "" {
+		return append([]string(nil), args...)
+	}
+	out := make([]string, 0, len(args))
+	for i := 0; i < len(args); i++ {
+		arg := args[i]
+		if arg == "--"+flagName {
+			// Skip the flag and (optionally) its value.
+			if i+1 < len(args) && !strings.HasPrefix(args[i+1], "-") {
+				i++
+			}
+			continue
+		}
+		if strings.HasPrefix(arg, "--"+flagName+"=") {
+			continue
+		}
+		out = append(out, arg)
+	}
+	return out
+}