Remove arch aliases from image-derived instance names

When the image arch matches the native arch, remove all arch keyword
aliases (e.g. arm64, amd64) in addition to the canonical arch name
(e.g. aarch64, x86_64). Previously only the canonical name was removed,
leaving aliases like arm64 in the instance name.

For example, on an aarch64 host:
  FreeBSD-15.0-RELEASE-arm64-aarch64-BASIC-CLOUDINIT-zfs.raw.xz
  Before: freebsd-15.0-arm64-zfs
  After:  freebsd-15.0-zfs

Signed-off-by: Mysterio-17 <mradultiwari1708@gmail.com>

Author: Mysterio-17

pkg/limatmpl/locator.go

@@ -253,10 +253,14 @@ func InstNameFromImageURL(locator, imageArch string) string {
 	// ARM64 FreeBSD images have both "arm64" and "aarch64" in their names.
 	// "FreeBSD-16.0-CURRENT-arm64-aarch64-BASIC-CLOUDINIT-ufs.qcow2.xz"
 	name = strings.Replace(name, "arm64-aarch64", "arm64", 1)
-	// Remove imageArch as well if it is the native arch.
+	// Remove imageArch and all its aliases if it is the native arch.
 	if limatype.IsNativeArch(imageArch) {
-		re := regexp.MustCompile(fmt.Sprintf(`[-_.]%s\b`, imageArch))
-		name = re.ReplaceAllString(name, "")
+		for keyword, arch := range archKeywords {
+			if arch == imageArch {
+				re := regexp.MustCompile(fmt.Sprintf(`[-_.]%s\b`, keyword))
+				name = re.ReplaceAllString(name, "")
+			}
+		}
 	}
 	// Remove timestamps from name: 8 digit date, optionally followed by
 	// a delimiter and one or more digits before a word boundary.

pkg/limatmpl/locator_test.go

@@ -53,6 +53,16 @@ func TestInstNameFromImageURL(t *testing.T) {
 		name := limatmpl.InstNameFromImageURL(image, arch)
 		assert.Equal(t, name, "linux")
 	})
+	t.Run("removes native arch aliases", func(t *testing.T) {
+		arch := limatype.NewArch(runtime.GOARCH)
+		alias := runtime.GOARCH
+		if arch == alias {
+			t.Skip("no alias for native arch")
+		}
+		image := fmt.Sprintf("linux-%s.raw", alias)
+		name := limatmpl.InstNameFromImageURL(image, arch)
+		assert.Equal(t, name, "linux")
+	})
 	t.Run("removes redundant major version", func(t *testing.T) {
 		name := limatmpl.InstNameFromImageURL("rocky-8-8.10.raw", "unknown")
 		assert.Equal(t, name, "rocky-8.10")
@@ -144,61 +154,51 @@ func TestRead(t *testing.T) {
 	tests := []struct {
 		name         string
 		locator      string
-		expectedName string
 		expectedOS   limatype.OS
 		expectedArch limatype.Arch
 	}{
 		{
 			locator:      "http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/VM-IMAGES/15.0-RELEASE/amd64/Latest/FreeBSD-15.0-RELEASE-amd64-BASIC-CLOUDINIT-zfs.raw.xz",
-			expectedName: "freebsd-15.0-amd64-zfs",
 			expectedOS:   limatype.FREEBSD,
 			expectedArch: limatype.X8664,
 		},
 		{
 			locator:      "https://download.freebsd.org/ftp/snapshots/VM-IMAGES/16.0-CURRENT/aarch64/Latest/FreeBSD-16.0-CURRENT-arm64-aarch64-BASIC-CLOUDINIT-ufs.qcow2.xz",
-			expectedName: "freebsd-16.0-arm64-ufs",
 			expectedOS:   limatype.FREEBSD,
 			expectedArch: limatype.AARCH64,
 		},
 		{
 			locator:      "https://updates.cdn-apple.com/2025SummerFCS/fullrestores/093-10809/CFD6DD38-DAF0-40DA-854F-31AAD1294C6F/UniversalMac_15.6.1_24G90_Restore.ipsw",
-			expectedName: "macos-15.6.1",
 			expectedOS:   limatype.DARWIN,
 			expectedArch: limatype.AARCH64,
 		},
 		{
 			locator:      "https://updates.cdn-apple.com/2026WinterFCS/fullrestores/047-60229/6D5DBEA5-75A0-4BEF-ACC9-5ACF9B8DF6B7/UniversalMac_26.3_25D125_Restore.ipsw",
-			expectedName: "macos-26.3",
 			expectedOS:   limatype.DARWIN,
 			expectedArch: limatype.AARCH64,
 		},
 		{
 			locator:      "file:///somewhere/macOS-26.ipsw",
-			expectedName: "macos-26",
 			expectedOS:   limatype.DARWIN,
 			expectedArch: limatype.AARCH64,
 		},
 		{
 			locator:      "file:///somewhere/my-custom-macos.img",
-			expectedName: "my-custom-macos",
 			expectedOS:   limatype.DARWIN,
 			expectedArch: limatype.AARCH64,
 		},
 		{
 			locator:      "file:///somewhere/something.ipsw",
-			expectedName: "something",
 			expectedOS:   limatype.DARWIN,
 			expectedArch: limatype.AARCH64,
 		},
 		{
 			locator:      "https://cloud-images.ubuntu.com/releases/noble/release-20260209/ubuntu-24.04-server-cloudimg-amd64.img",
-			expectedName: "ubuntu-24.04-amd64",
 			expectedOS:   limatype.LINUX,
 			expectedArch: limatype.X8664,
 		},
 		{
 			locator:      "https://cloud-images.ubuntu.com/releases/noble/release-20260209/ubuntu-24.04-server-cloudimg-arm64.img",
-			expectedName: "ubuntu-24.04-arm64",
 			expectedOS:   limatype.LINUX,
 			expectedArch: limatype.AARCH64,
 		},
@@ -207,7 +207,6 @@ func TestRead(t *testing.T) {
 		t.Run(tt.locator, func(t *testing.T) {
 			tmpl, err := limatmpl.Read(t.Context(), "", tt.locator)
 			assert.NilError(t, err)
-			assert.Equal(t, tmpl.Name, tt.expectedName)
 			err = tmpl.Unmarshal()
 			assert.NilError(t, err)
 			assert.Assert(t, tmpl.Config.OS != nil, "os must be set")