Merge pull request kubernetes#26450 from droslean/bz-groups

[bugzilla] allow bugs to hold extra groups than configured
dfrojas · May 31, 2022 · a2c8022 · a2c8022
2 parents 121aa20 + ab4e5df
commit a2c8022
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/prow/plugins/bugzilla/bugzilla.go b/prow/plugins/bugzilla/bugzilla.go
@@ -1251,18 +1251,5 @@ func isBugAllowed(bug *bugzilla.Bug, allowedGroups []string) bool {
 	if len(allowedGroups) == 0 {
 		return true
 	}
-
-	for _, group := range bug.Groups {
-		found := false
-		for _, allowed := range allowedGroups {
-			if group == allowed {
-				found = true
-				break
-			}
-		}
-		if !found {
-			return false
-		}
-	}
-	return true
+	return sets.NewString(bug.Groups...).HasAll(allowedGroups...)
 }
diff --git a/prow/plugins/bugzilla/bugzilla_test.go b/prow/plugins/bugzilla/bugzilla_test.go
@@ -2311,11 +2311,19 @@ func TestIsBugAllowed(t *testing.T) {
 			expected: true,
 		},
 		{
-			name: "some but not all groups matching is not allowed",
+			name: "multiple groups in bug but with all allowed included is allowed",
 			bug: &bugzilla.Bug{
 				Groups: []string{"whoa", "really", "cool"},
 			},
 			groups:   []string{"whoa", "really"},
+			expected: true,
+		},
+		{
+			name: "multiple groups in bug but not all allowed included is not allowed",
+			bug: &bugzilla.Bug{
+				Groups: []string{"whoa", "cool"},
+			},
+			groups:   []string{"whoa", "really"},
 			expected: false,
 		},
 		{