Packaging: rename arm64 suffix to aarch64 in the tar.gz artifacts ONLY (#28813)

v1v · web-flow · commit 13dc3de89d4f · 2022-01-20T13:35:08.000Z
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -24,6 +24,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Remove option `setup.template.type` and always load composable template with data streams. {pull}28450[28450]
 - Remove several ILM options (`rollover_alias` and `pattern`) as data streams does not require index aliases. {pull}28450[28450]
 - Index template's default_fields setting is only populated with ECS fields. {pull}28596[28596] {issue}28215[28215]
+- tar.gz packages for ARM64 will now use the suffix `aarch64` rather than `arm64`. {pull}28813[28813]
 - Remove deprecated `--template` and `--ilm-policy` flags. Use `--index-management` instead. {pull}28870[28870]
 - Remove options `logging.files.suffix` and default to datetime endings. {pull}28927[28927]
 - Remove Journalbeat. Use `journald` input of Filebeat instead. {pull}29131[29131]
diff --git a/dev-tools/mage/pkgtypes.go b/dev-tools/mage/pkgtypes.go
@@ -162,7 +162,7 @@ var OSArchNames = map[string]map[PackageType]map[string]string{
 			"armv5":    "armv5",
 			"armv6":    "armv6",
 			"armv7":    "armv7",
-			"arm64":    "arm64",
+			"arm64":    "aarch64",
 			"mips":     "mips",
 			"mipsle":   "mipsel",
 			"mips64":   "mips64",
diff --git a/x-pack/elastic-agent/magefile.go b/x-pack/elastic-agent/magefile.go
@@ -308,7 +308,7 @@ func Package() {
 	}{
 		{"darwin/amd64", "darwin-x86_64.tar.gz"},
 		{"linux/amd64", "linux-x86_64.tar.gz"},
-		{"linux/arm64", "linux-arm64.tar.gz"},
+		{"linux/arm64", "linux-aarch64.tar.gz"},
 		{"windows/amd64", "windows-x86_64.zip"},
 	}
 
diff --git a/x-pack/elastic-agent/pkg/artifact/artifact.go b/x-pack/elastic-agent/pkg/artifact/artifact.go
@@ -15,7 +15,7 @@ import (
 var packageArchMap = map[string]string{
 	"linux-binary-32":    "linux-x86.tar.gz",
 	"linux-binary-64":    "linux-x86_64.tar.gz",
-	"linux-binary-arm64": "linux-arm64.tar.gz",
+	"linux-binary-arm64": "linux-aarch64.tar.gz",
 	"windows-binary-32":  "windows-x86.zip",
 	"windows-binary-64":  "windows-x86_64.zip",
 	"darwin-binary-32":   "darwin-x86_64.tar.gz",
diff --git a/x-pack/elastic-agent/pkg/artifact/download/http/elastic_test.go b/x-pack/elastic-agent/pkg/artifact/download/http/elastic_test.go
@@ -170,7 +170,7 @@ func getElasticCoClient() http.Client {
 		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "i686.rpm"):             struct{}{},
 		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "x86_64.rpm"):           struct{}{},
 		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "linux-x86.tar.gz"):     struct{}{},
-		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "linux-arm64.tar.gz"):   struct{}{},
+		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "linux-aarch64.tar.gz"): struct{}{},
 		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "linux-x86_64.tar.gz"):  struct{}{},
 		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "windows-x86.zip"):      struct{}{},
 		fmt.Sprintf("%s-%s-%s", beatSpec.Cmd, version, "windows-x86_64.zip"):   struct{}{},

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ func Package() {`
`308`	`308`	`}{`
`309`	`309`	`{"darwin/amd64", "darwin-x86_64.tar.gz"},`
`310`	`310`	`{"linux/amd64", "linux-x86_64.tar.gz"},`
`311`		`- {"linux/arm64", "linux-arm64.tar.gz"},`
	`311`	`+ {"linux/arm64", "linux-aarch64.tar.gz"},`
`312`	`312`	`{"windows/amd64", "windows-x86_64.zip"},`
`313`	`313`	`}`
`314`	`314`