Merge pull request #24 from inteon/bugfix_linter

Fix diff bug in RemoveExtensions caused by multiple prefixes; and fix bug in sorting

Author: jetstack-bot

linter/diff_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package linter
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/cert-manager/helm-tool/linter/sets"
@@ -92,12 +93,20 @@ func TestDiffPaths(t *testing.T) {
 			wantMissingA: sets.New("app.logLevela", "app.name"),
 			wantMissingB: sets.New("app.test"),
 		},
+		{
+			a:            sets.New("app.test1", "app.test2"),
+			b:            sets.New("app"),
+			wantMissingA: sets.New[string](),
+			wantMissingB: sets.New[string](),
+		},
 	}
 
 	for _, tc := range testcases {
-		diffA, diffB := DiffPaths(tc.a, tc.b)
+		t.Run(fmt.Sprintf("%s-%s", tc.a, tc.b), func(t *testing.T) {
+			diffA, diffB := DiffPaths(tc.a, tc.b)
 
-		require.ElementsMatch(t, tc.wantMissingA.UnsortedList(), diffA.UnsortedList())
-		require.ElementsMatch(t, tc.wantMissingB.UnsortedList(), diffB.UnsortedList())
+			require.ElementsMatch(t, tc.wantMissingA.UnsortedList(), diffA.UnsortedList())
+			require.ElementsMatch(t, tc.wantMissingB.UnsortedList(), diffB.UnsortedList())
+		})
 	}
 }

linter/sets/prefix.go

@@ -32,9 +32,14 @@ func RemovePrefixes(items Set[string], sets ...Set[string]) Set[string] {
 	nonPrefixes := maps.Clone(items)
 
 	values := Union(append(sets, items)...).UnsortedList()
-	slices.Sort(values)
+	slices.SortFunc(values, func(a, b string) int {
+		aSort := strings.ReplaceAll(a, "[", ".[") + "."
+		bSort := strings.ReplaceAll(b, "[", ".[") + "."
+		return strings.Compare(aSort, bSort)
+	})
+
 	for i := 0; i < len(values); i++ {
-		// If the next value is an extension of the current value, skip
+		// If the next value is an extension of the current value, remove
 		// the current value.
 		if i+1 < len(values) && (strings.HasPrefix(values[i+1], values[i]+".") || strings.HasPrefix(values[i+1], values[i]+"[")) {
 			nonPrefixes.Delete(values[i])
@@ -54,12 +59,21 @@ func RemoveExtensions(items Set[string], sets ...Set[string]) Set[string] {
 	nonExtensions := maps.Clone(items)
 
 	values := Union(append(sets, items)...).UnsortedList()
-	slices.Sort(values)
+	slices.SortFunc(values, func(a, b string) int {
+		aSort := strings.ReplaceAll(a, "[", ".[") + "."
+		bSort := strings.ReplaceAll(b, "[", ".[") + "."
+		return strings.Compare(aSort, bSort)
+	})
+
+OuterLoop:
 	for i := 0; i < len(values); i++ {
-		// If the next value is an extension of the current value, skip
-		// the current value.
-		if i+1 < len(values) && (strings.HasPrefix(values[i+1], values[i]+".") || strings.HasPrefix(values[i+1], values[i]+"[")) {
-			nonExtensions.Delete(values[i+1])
+		// Remove all following values that are extensions of the current value.
+		for j := i + 1; j < len(values); j++ {
+			if !strings.HasPrefix(values[j], values[i]+".") && !strings.HasPrefix(values[j], values[i]+"[") {
+				continue OuterLoop
+			}
+
+			nonExtensions.Delete(values[j])
 		}
 	}