Make prefix regex non-greedy

This makes it possible to deal with major version numbers > 9. Without this patch, a version like v42.1.0 would be parsed as 2.1.0, stripping a prefix of v4
anton-yurchenko · Jan 2, 2021 · 8ee8370 · 8ee8370
1 parent 269d99f
commit 8ee8370
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/internal/pkg/repository/repository.go b/internal/pkg/repository/repository.go
@@ -39,7 +39,7 @@ func (r *Repository) ReadTag(version *string, allowPrefix bool) error {
 
 	var expression string
 	if allowPrefix {
-		expression = fmt.Sprintf("^refs/tags/(?P<prefix>.*)%v$", semver)
+		expression = fmt.Sprintf("^refs/tags/(?P<prefix>.*?)%v$", semver)
 	} else {
 		expression = fmt.Sprintf("^refs/tags/%v$", semver)
 	}

diff --git a/internal/pkg/repository/repository_test.go b/internal/pkg/repository/repository_test.go
@@ -31,7 +31,7 @@ func TestReadTag(t *testing.T) {
 			Ref:           "v1.0.0",
 			Version:       "1.0.0",
 			AllowPrefix:   true,
-			ExpectedError: "malformed env.var 'GITHUB_REF' (control tag prefix via env.var 'ALLOW_TAG_PREFIX'): expected to match regex '^refs/tags/(?P<prefix>.*)(?P<major>0|[1-9]\\d*)\\.(?P<minor>0|[1-9]\\d*)\\.(?P<patch>0|[1-9]\\d*)(?:(?P<sep1>-)(?P<prerelease>(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:(?P<sep2>\\+)(?P<buildmetadata>[0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$', got 'v1.0.0'",
+			ExpectedError: "malformed env.var 'GITHUB_REF' (control tag prefix via env.var 'ALLOW_TAG_PREFIX'): expected to match regex '^refs/tags/(?P<prefix>.*?)(?P<major>0|[1-9]\\d*)\\.(?P<minor>0|[1-9]\\d*)\\.(?P<patch>0|[1-9]\\d*)(?:(?P<sep1>-)(?P<prerelease>(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:(?P<sep2>\\+)(?P<buildmetadata>[0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$', got 'v1.0.0'",
 		},
 		"Missing Environment Variable": {
 			Ref:           "",