[AUTO-CHERRYPICK] Fixing epoch matching in 'InstallPackageRegex'. - branch main (#9131)

Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>

Author: CBL-Mariner-Bot

toolkit/tools/internal/tdnf/tdnf.go

@@ -14,14 +14,14 @@ import (
 var (
 	// Every valid line will be of the form: <package_name> <architecture> <version>.<dist> <repo_id>
 	// For:
-	//     X aarch64	1.1b.8_X-22~rc1.cm2		fetcher-cloned-repo
+	//     X aarch64	5:1.1b.8_X-22~rc1.cm2		fetcher-cloned-repo
 	//
 	// We'd get:
 	//   - package_name:    X
 	//   - architecture:    aarch64
-	//   - version:         1.1b.8_X-22~rc1
+	//   - version:         5:1.1b.8_X-22~rc1
 	//   - dist:            cm2
-	InstallPackageRegex = regexp.MustCompile(`^\s*([[:alnum:]_.+-]+)\s+([[:alnum:]_+-]+)\s+([[:alnum:]._+~-]+)\.([[:alpha:]]+[[:digit:]]+)`)
+	InstallPackageRegex = regexp.MustCompile(`^\s*([[:alnum:]_.+-]+)\s+([[:alnum:]_+-]+)\s+((?:[[:digit:]]:)?[[:alnum:]._+~-]+)\.([[:alpha:]]+[[:digit:]]+)`)
 
 	// Every valid line pair will be of the form:
 	//		<package>-<version>.<arch> : <Description>

toolkit/tools/internal/tdnf/tdnf_test.go

@@ -72,3 +72,84 @@ func TestGetMajorVersionFromString_RejectTrailingDot(t *testing.T) {
 	_, err := getMajorVersionFromString(fullVersion)
 	assert.Error(t, err)
 }
+
+func TestInstallPackageRegex_MatchesPackageName(t *testing.T) {
+	const line = "X aarch64 1.1b.8_X-22~rc1.cm2 fetcher-cloned-repo"
+
+	matches := InstallPackageRegex.FindStringSubmatch(line)
+
+	assert.Len(t, matches, InstallMaxMatchLen)
+	assert.Equal(t, "X", matches[InstallPackageName])
+}
+
+func TestInstallPackageRegex_FailsForMissingPackageName(t *testing.T) {
+	const line = " aarch64 1.1b.8_X-22~rc1.cm2 fetcher-cloned-repo"
+
+	assert.False(t, InstallPackageRegex.MatchString(line))
+}
+
+func TestInstallPackageRegex_MatchesPackageArch(t *testing.T) {
+	const line = "X aarch64 1.1b.8_X-22~rc1.cm2 fetcher-cloned-repo"
+
+	matches := InstallPackageRegex.FindStringSubmatch(line)
+
+	assert.Len(t, matches, InstallMaxMatchLen)
+	assert.Equal(t, "aarch64", matches[InstallPackageArch])
+}
+
+func TestInstallPackageRegex_FailsForMissingArch(t *testing.T) {
+	const line = "X  1.1b.8_X-22~rc1.cm2 fetcher-cloned-repo"
+
+	assert.False(t, InstallPackageRegex.MatchString(line))
+}
+
+func TestInstallPackageRegex_MatchesPackageVersionNoEpoch(t *testing.T) {
+	const line = "X aarch64 1.1b.8_X-22~rc1.cm2 fetcher-cloned-repo"
+
+	matches := InstallPackageRegex.FindStringSubmatch(line)
+
+	assert.Len(t, matches, InstallMaxMatchLen)
+	assert.Equal(t, "1.1b.8_X-22~rc1", matches[InstallPackageVersion])
+}
+
+func TestInstallPackageRegex_MatchesPackageVersionWithEpoch(t *testing.T) {
+	const line = "X aarch64 5:1.1b.8_X-22~rc1.cm2 fetcher-cloned-repo"
+
+	matches := InstallPackageRegex.FindStringSubmatch(line)
+
+	assert.Len(t, matches, InstallMaxMatchLen)
+	assert.Equal(t, "5:1.1b.8_X-22~rc1", matches[InstallPackageVersion])
+}
+
+func TestInstallPackageRegex_FailsForMissingVersion(t *testing.T) {
+	const line = "X aarch64 .cm2 fetcher-cloned-repo"
+
+	assert.False(t, InstallPackageRegex.MatchString(line))
+}
+
+func TestInstallPackageRegex_MatchesPackageDist(t *testing.T) {
+	const line = "X aarch64 1.1b.8_X-22~rc1.cm2 fetcher-cloned-repo"
+
+	matches := InstallPackageRegex.FindStringSubmatch(line)
+
+	assert.Len(t, matches, InstallMaxMatchLen)
+	assert.Equal(t, "cm2", matches[InstallPackageDist])
+}
+
+func TestInstallPackageRegex_FailsForMissingDist(t *testing.T) {
+	const line = "X aarch64 1.1b.8_X-22~rc1 fetcher-cloned-repo"
+
+	assert.False(t, InstallPackageRegex.MatchString(line))
+}
+
+func TestInstallPackageRegex_MatchesRandomWhiteSpaces(t *testing.T) {
+	const line = "X   aarch64  1.1b.8_X-22~rc1.cm2          	fetcher-cloned-repo"
+
+	assert.True(t, InstallPackageRegex.MatchString(line))
+}
+
+func TestInstallPackageRegex_DoesNotMatchInvalidLine(t *testing.T) {
+	const line = "Invalid line"
+
+	assert.False(t, InstallPackageRegex.MatchString(line))
+}