image build: rename goArchToArchitectureLabel

The function is used for more than just getting architecture labels now.

Signed-off-by: Adam Cmiel <acmiel@redhat.com>

Author: chmeliik

pkg/commands/build.go

@@ -767,7 +767,7 @@ func findPrefetchResources(prefetchDir string) (*prefetchResources, error) {
 		resources.envFile = envfiles[0]
 	}
 
-	currentArch := goArchToArchitectureLabel(runtime.GOARCH)
+	currentArch := goArchToRpmArch(runtime.GOARCH)
 
 	reposD := filepath.Join(prefetchDir, "output", "deps", "rpm", currentArch, "repos.d")
 	if _, err := os.Lstat(reposD); err == nil {
@@ -873,7 +873,7 @@ func (c *Build) copyPrefetchDir() (string, error) {
 
 	l.Logger.Debugf("Copying prefetch resources to %s", prefetchDirCopy)
 
-	currentArch := goArchToArchitectureLabel(runtime.GOARCH)
+	currentArch := goArchToRpmArch(runtime.GOARCH)
 	// Clean the filepaths, we do string comparisons below
 	prefetchDir = filepath.Clean(prefetchDir)
 	prefetchDirCopy = filepath.Clean(prefetchDirCopy)
@@ -1335,7 +1335,7 @@ func (c *Build) processLabelsAndAnnotations() error {
 	if c.Params.AddLegacyLabels {
 		defaultLabels = append(defaultLabels, "build-date="+buildTimeStr)
 
-		arch := goArchToArchitectureLabel(runtime.GOARCH)
+		arch := goArchToRpmArch(runtime.GOARCH)
 		defaultLabels = append(defaultLabels, "architecture="+arch)
 
 		if c.Params.ImageSource != "" {
@@ -1406,11 +1406,8 @@ func parseAnnotationsFile(filePath string) ([]string, error) {
 	return annotationStrings, nil
 }
 
-// Convert Go's GOARCH value to the value used for the 'architecture' label.
-//
-// Historically, the 'architecture' label used the RPM architecture names rather
-// than the GOARCH names. Keep that the same.
-func goArchToArchitectureLabel(goarch string) string {
+// Convert a supported GOARCH value to the corresponding RPM architecture name.
+func goArchToRpmArch(goarch string) string {
 	switch goarch {
 	case "amd64":
 		return "x86_64"

pkg/commands/build_test.go

@@ -1145,7 +1145,7 @@ func Test_goArchToArchitectureLabel(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		result := goArchToArchitectureLabel(tc.goarch)
+		result := goArchToRpmArch(tc.goarch)
 		g.Expect(result).To(Equal(tc.expected), "goArchToUname(%s) should return %s", tc.goarch, tc.expected)
 	}
 }
@@ -1249,7 +1249,7 @@ func Test_Build_processLabelsAndAnnotations(t *testing.T) {
 		err := c.processLabelsAndAnnotations()
 		g.Expect(err).ToNot(HaveOccurred())
 
-		arch := goArchToArchitectureLabel(runtime.GOARCH)
+		arch := goArchToRpmArch(runtime.GOARCH)
 		g.Expect(c.mergedLabels).To(Equal([]string{
 			"org.opencontainers.image.created=2026-01-01T00:00:00Z",
 			"org.opencontainers.image.source=https://github.com/org/repo",
@@ -1950,7 +1950,7 @@ func Test_Build_copyPrefetchDir(t *testing.T) {
 	t.Run("filters RPM dirs by architecture", func(t *testing.T) {
 		g := NewWithT(t)
 
-		currentArch := goArchToArchitectureLabel(runtime.GOARCH)
+		currentArch := goArchToRpmArch(runtime.GOARCH)
 		otherArch := "s390x"
 
 		srcDir := t.TempDir()