fix: default ref regex should not include spaces and quotes when matc…

…hing (#160) * fix: default ref regex should not include spaces and quotes when matching Signed-off-by: Amit Lin <amitlin.dev@gmail.com> * test: added test cases Signed-off-by: Amit Lin <amitlin.dev@gmail.com> --------- Signed-off-by: Amit Lin <amitlin.dev@gmail.com>
helmfile · Aug 4, 2023 · 2cea569 · 2cea569
1 parent aeb6ced
commit 2cea569
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/pkg/expansion/expand_match.go b/pkg/expansion/expand_match.go
@@ -12,7 +12,7 @@ type ExpandRegexMatch struct {
 	Only   []string
 }
 
-var DefaultRefRegexp = regexp.MustCompile(`((secret)?ref)\+([^\+:]*://[^\+\n]+)\+?`)
+var DefaultRefRegexp = regexp.MustCompile(`((secret)?ref)\+([^\+:]*:\/\/[^\+\n "]+)\+?`)
 
 func (e *ExpandRegexMatch) InString(s string) (string, error) {
 	var sb strings.Builder

diff --git a/pkg/expansion/expand_match_test.go b/pkg/expansion/expand_match_test.go
@@ -103,6 +103,27 @@ func TestExpandRegexpMatchInString(t *testing.T) {
 			input:    "ref+vault://srv/foo/bar\n",
 			expected: "vault-srv-/foo/bar\n",
 		},
+		{
+			name:     "it should not match closing quotes when using query params",
+			regex:    DefaultRefRegexp,
+			only:     []string{"ref", "secretref"},
+			input:    "\"ref+awsssm://srv/foo/bar?mode=singleparam\"",
+			expected: "\"awsssm-srv-/foo/bar\"",
+		},
+		{
+			name:     "it should match greedily upto a space when using query params",
+			regex:    DefaultRefRegexp,
+			only:     []string{"ref", "secretref"},
+			input:    "ref+awsssm://srv/foo/bar?mode=singleparam some-string",
+			expected: "awsssm-srv-/foo/bar some-string",
+		},
+		{
+			name:     "it should handle multiple refs when using query params",
+			regex:    DefaultRefRegexp,
+			only:     []string{"ref", "secretref"},
+			input:    "ref+awsssm://srv/foo/bar?mode=singleparam some-string ref+awsssm://srv/foo/bar?mode=singleparam",
+			expected: "awsssm-srv-/foo/bar some-string awsssm-srv-/foo/bar",
+		},
 	}
 
 	for i := range testcases {