versionsprocessor: sanitize dots and plus signs in RPM macro names (#16914)

Co-authored-by: Kshitiz Godara <kgodara@microsoft.com>

Author: kgodara912

toolkit/tools/versionsprocessor/versionsprocessor.go

@@ -29,6 +29,7 @@ import (
 )
 
 var packageVersionRegexp = regexp.MustCompile(`^[^:]+: (?:(.+):)?(.+)-(.+)$`)
+var invalidMacroCharRegexp = regexp.MustCompile(`[^a-zA-Z0-9_]`)
 
 var (
 	app           = kingpin.New("versionsprocessor", "A tool to generate a macro file of all specs version and release")
@@ -189,9 +190,10 @@ func processPackageVersionString(packageVersionString string, specFileName strin
 	release := releaseVerSplit[2]
 	releaseClean := strings.Replace(release, distTag, "", 1)
 
-	// strip out the .spec suffix and replace '-' with '_' as RPM macros cannot have '-'
+	// strip out the .spec suffix and replace characters invalid in RPM macro names with '_'
+	// RPM macro names may only contain alphanumeric characters and underscores.
 	packageFileNameMacroFormat := strings.Replace(specFileName, ".spec", "", 1)
-	packageFileNameMacroFormat = strings.ReplaceAll(packageFileNameMacroFormat, "-", "_")
+	packageFileNameMacroFormat = invalidMacroCharRegexp.ReplaceAllString(packageFileNameMacroFormat, "_")
 
 	epochReleaseString := prefix + "_" + packageFileNameMacroFormat + "_epoch"
 	versionMacroString := prefix + "_" + packageFileNameMacroFormat + "_version"

toolkit/tools/versionsprocessor/versionsprocessor_test.go

@@ -127,6 +127,38 @@ func TestProcessPackageVersionString_TableDriven(t *testing.T) {
 			expectedVersion: "%azl_openssl_version 3.3.0",
 			expectedRelease: "%azl_openssl_release 1.1",
 		},
+		{
+			name:            "dot in spec name replaced with underscore",
+			input:           "rubygem-cool.io: 1.8.0-1.azl3",
+			specFile:        "rubygem-cool.io.spec",
+			prefix:          "azl",
+			expectedVersion: "%azl_rubygem_cool_io_version 1.8.0",
+			expectedRelease: "%azl_rubygem_cool_io_release 1",
+		},
+		{
+			name:            "plus in spec name replaced with underscore",
+			input:           "libxml++: 5.0.3-1.azl3",
+			specFile:        "libxml++.spec",
+			prefix:          "azl",
+			expectedVersion: "%azl_libxml___version 5.0.3",
+			expectedRelease: "%azl_libxml___release 1",
+		},
+		{
+			name:            "versioned spec name with dot",
+			input:           "rust-1.75: 1.75.0-27.azl3",
+			specFile:        "rust-1.75.spec",
+			prefix:          "azl",
+			expectedVersion: "%azl_rust_1_75_version 1.75.0",
+			expectedRelease: "%azl_rust_1_75_release 27",
+		},
+		{
+			name:            "golang versioned spec with dot",
+			input:           "golang-1.25: 1.25.9-1.azl3",
+			specFile:        "golang-1.25.spec",
+			prefix:          "azl",
+			expectedVersion: "%azl_golang_1_25_version 1.25.9",
+			expectedRelease: "%azl_golang_1_25_release 1",
+		},
 	}
 
 	for _, tt := range tests {