bot: single-reviewer for multiple helmrelease/values in same folder (#…

…228)
gravitational · Feb 21, 2024 · e9e944d · e9e944d
1 parent 3587e92
commit e9e944d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/bot/internal/bot/bot_test.go b/bot/internal/bot/bot_test.go
@@ -388,6 +388,16 @@ func TestApproverCount(t *testing.T) {
 			paths:  []string{"lib", "src/*/values.yaml"},
 			expect: 1,
 		},
+		{
+			desc: "helmrelease files match wildcard",
+			files: []github.PullRequestFile{
+				{Name: "src/package/helmrelease-with-suffix.yaml"},
+				{Name: "src/package/prefix-helmrelease.yaml"},
+				{Name: "lib/db.go"},
+			},
+			paths:  []string{"lib", "src/*/*helmrelease*.yaml"},
+			expect: 1,
+		},
 		{
 			desc: "one file doesn't match wildcard",
 			files: []github.PullRequestFile{

diff --git a/bot/internal/review/review.go b/bot/internal/review/review.go
@@ -57,10 +57,10 @@ var (
 			"deploy/fluxcd/config/*/values.yaml",
 			"deploy/fluxcd/config/*/*/values.yaml",
 			"deploy/fluxcd/config/*/*/*/values.yaml",
-			"deploy/fluxcd/src/platform/*/values.helm.yaml",
-			"deploy/fluxcd/src/platform/*/helmrelease.yaml",
-			"deploy/fluxcd/src/platform/*/*/values.helm.yaml",
-			"deploy/fluxcd/src/platform/*/*/helmrelease.yaml",
+			"deploy/fluxcd/src/platform/*/*values.helm.yaml",
+			"deploy/fluxcd/src/platform/*/*helmrelease*.yaml",
+			"deploy/fluxcd/src/platform/*/*/*values.helm.yaml",
+			"deploy/fluxcd/src/platform/*/*/*helmrelease*.yaml",
 		},
 	}