tools/bumper: Fix #sha characters in vtag

The bumper currently assumes that virtual tags consists of eight sha characters after the "g" (for example: v0.39.0-32-g12345678). This is not the default configuration (which is seven). As this number of sha characters is configurable, changing the regex in isVtagFormat to accept any number of character (bigger than four which is what 'git describe --abbrev=X' accepts) as a valid vtag format. Also, fixing unit tests to use character aligned to the default and adding more to check the above logic. Signed-off-by: Ram Lavi <[email protected]>
RamLavi · Sep 10, 2024 · 2f7fdec · 2f7fdec
1 parent 1b6e3cd
commit 2f7fdec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/tools/bumper/cnao_repo_commands.go b/tools/bumper/cnao_repo_commands.go
@@ -376,9 +376,9 @@ func canonicalizeVersion(version string) (*semver.Version, error) {
 	return semver.NewVersion(version)
 }
 
-// check vtag format (example: 0.39.0-32-g1fcbe815)
+// check vtag format (example: 0.39.0-32-g1fbe815)
 func isVtagFormat(tagVersion string) bool {
-	var vtagSyntax = regexp.MustCompile(`^v[0-9]\.[0-9]+\.*[0-9]*-[0-9]+-g[0-9,a-f]{8}`)
+	var vtagSyntax = regexp.MustCompile(`^v[0-9]+\.[0-9]+\.[0-9]+-[0-9]+-g[a-zA-Z0-9]{5,}$`)
 	return vtagSyntax.MatchString(tagVersion)
 }
 

diff --git a/tools/bumper/cnao_repo_commands_test.go b/tools/bumper/cnao_repo_commands_test.go
@@ -188,8 +188,16 @@ var _ = Describe("Testing internal git CNAO Repo", func() {
 			version:        "version1.2.3",
 			expectedResult: false,
 		}),
-		Entry("When using vtag version format, Should recognize as vtag format", isVtagFormatParams{
-			version:        "v0.39.0-32-g1fcbe815",
+		Entry("When using vtag version format with 4 sha character, Should not recognize as vtag format", isVtagFormatParams{
+			version:        "v0.39.0-32-g1fbe",
+			expectedResult: false,
+		}),
+		Entry("When using vtag version format with 5 sha character, Should recognize as vtag format", isVtagFormatParams{
+			version:        "v0.39.0-32-g1fbe8",
+			expectedResult: true,
+		}),
+		Entry("When using vtag version format with 7 sha character (default), Should recognize as vtag format", isVtagFormatParams{
+			version:        "v0.39.0-32-g1fbe845",
 			expectedResult: true,
 		}),
 	)
@@ -230,7 +238,7 @@ var _ = Describe("Testing internal git CNAO Repo", func() {
 		}),
 		Entry("Should bump when latestReleaseVersion is in vtag-format", isComponentBumpNeededParams{
 			currentReleaseVersion: "v0.20.9",
-			latestReleaseVersion:  "v0.20.9-1-g4cd31235",
+			latestReleaseVersion:  "v0.20.9-1-g4cd3135",
 			updatePolicy:          "latest",
 			prTitle:               dummyPRTitle,
 			isBumpExpected:        true,
@@ -277,16 +285,16 @@ var _ = Describe("Testing internal git CNAO Repo", func() {
 			isValid:               false,
 		}),
 		Entry("Should bump when currentReleaseVersion is in vtag-format", isComponentBumpNeededParams{
-			currentReleaseVersion: "v0.44.1-4-g4cd33665",
+			currentReleaseVersion: "v0.44.1-4-g4d33665",
 			latestReleaseVersion:  "v0.43.1",
 			updatePolicy:          "latest",
 			prTitle:               dummyPRTitle,
 			isBumpExpected:        true,
 			isValid:               true,
 		}),
 		Entry("Should not bump when currentReleaseVersion is in vtag-format and equals latestReleaseVersion", isComponentBumpNeededParams{
-			currentReleaseVersion: "v0.36.2-5-g4cd4566",
-			latestReleaseVersion:  "v0.36.2-5-g4cd4566",
+			currentReleaseVersion: "v0.36.2-5-g4d4566",
+			latestReleaseVersion:  "v0.36.2-5-g4d4566",
 			updatePolicy:          "latest",
 			prTitle:               dummyPRTitle,
 			isBumpExpected:        false,