fix(fields): handle nexted fields when excluding (#6359)

Signed-off-by: AntoineDao <antoinedao1@gmail.com>
argoproj · Jul 19, 2021 · bd5a8a9 · bd5a8a9
1 parent cfab7db
commit bd5a8a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/util/fields/fields.go b/util/fields/fields.go
@@ -60,7 +60,7 @@ func (f Cleaner) WillExclude(x string) bool {
 
 func (f Cleaner) matches(x string) bool {
 	for y := range f.fields {
-		if strings.HasPrefix(x, y) {
+		if strings.HasPrefix(x, y) || strings.HasPrefix(y, x) {
 			return true
 		}
 	}

diff --git a/util/fields/fields_test.go b/util/fields/fields_test.go
@@ -28,6 +28,8 @@ func TestCleaner_WillExclude(t *testing.T) {
 		assert.False(t, NewCleaner("foo").WillExclude("foo"))
 		assert.False(t, NewCleaner("foo").WillExclude("foo.bar"))
 		assert.True(t, NewCleaner("foo").WillExclude("bar"))
+		assert.False(t, NewCleaner("foo.bar.baz").WillExclude("foo.bar"))
+
 	})
 	t.Run("Exclude", func(t *testing.T) {
 		assert.True(t, NewCleaner("-foo").WillExclude("foo"))