Add support for arm64_mac architecture

jaysoffian · lbajolet-hashicorp · commit 3c9034f5d66c · 2024-06-20T10:46:24.000-04:00
diff --git a/.web-docs/components/builder/chroot/README.md b/.web-docs/components/builder/chroot/README.md
@@ -214,7 +214,7 @@ necessary for this build to succeed and can be found further down the page.
   prefix `kms_key_id` with `alias/`.
 
 - `ami_architecture` (string) - what architecture to use when registering the final AMI; valid options
-  are "arm64", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".
+  are "arm64", "arm64_mac", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".
 
 - `boot_mode` (string) - The boot mode. Valid options are `legacy-bios` and `uefi`. See the documentation on
   [boot modes](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-boot.html) for
diff --git a/.web-docs/components/builder/ebssurrogate/README.md b/.web-docs/components/builder/ebssurrogate/README.md
@@ -72,7 +72,7 @@ necessary for this build to succeed and can be found further down the page.
   will allow you to create those programatically.
 
 - `ami_architecture` (string) - what architecture to use when registering the final AMI; valid options
-  are "arm64", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".
+  are "arm64", "arm64_mac", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".
 
 - `boot_mode` (string) - The boot mode. Valid options are `legacy-bios` and `uefi`. See the documentation on
   [boot modes](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-boot.html) for
diff --git a/builder/chroot/builder.go b/builder/chroot/builder.go
@@ -195,7 +195,7 @@ type Config struct {
 	// prefix `kms_key_id` with `alias/`.
 	RootVolumeKmsKeyId string `mapstructure:"root_volume_kms_key_id" required:"false"`
 	// what architecture to use when registering the final AMI; valid options
-	// are "arm64", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".
+	// are "arm64", "arm64_mac", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".
 	Architecture string `mapstructure:"ami_architecture" required:"false"`
 	// The boot mode. Valid options are `legacy-bios` and `uefi`. See the documentation on
 	// [boot modes](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-boot.html) for
@@ -370,14 +370,14 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 
 	}
 	valid := false
-	for _, validArch := range []string{"arm64", "i386", "x86_64", "x86_64_mac"} {
+	for _, validArch := range []string{"arm64", "arm64_mac", "i386", "x86_64", "x86_64_mac"} {
 		if validArch == b.config.Architecture {
 			valid = true
 			break
 		}
 	}
 	if !valid {
-		errs = packersdk.MultiErrorAppend(errs, errors.New(`The only valid ami_architecture values are "arm64", "i386", "x86_64", or "x86_64_mac"`))
+		errs = packersdk.MultiErrorAppend(errs, errors.New(`The only valid ami_architecture values are "arm64", "arm64_mac", "i386", "x86_64", or "x86_64_mac"`))
 	}
 
 	if b.config.TpmSupport != "" && b.config.TpmSupport != ec2.TpmSupportValuesV20 {
diff --git a/builder/ebssurrogate/builder.go b/builder/ebssurrogate/builder.go
@@ -71,7 +71,7 @@ type Config struct {
 	// will allow you to create those programatically.
 	VolumeRunTag config.NameValues `mapstructure:"run_volume_tag" required:"false"`
 	// what architecture to use when registering the final AMI; valid options
-	// are "arm64", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".
+	// are "arm64", "arm64_mac", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".
 	Architecture string `mapstructure:"ami_architecture" required:"false"`
 	// The boot mode. Valid options are `legacy-bios` and `uefi`. See the documentation on
 	// [boot modes](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-boot.html) for
@@ -186,14 +186,14 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 		b.config.Architecture = "x86_64"
 	}
 	valid := false
-	for _, validArch := range []string{"arm64", "i386", "x86_64", "x86_64_mac"} {
+	for _, validArch := range []string{"arm64", "arm64_mac", "i386", "x86_64", "x86_64_mac"} {
 		if validArch == b.config.Architecture {
 			valid = true
 			break
 		}
 	}
 	if !valid {
-		errs = packersdk.MultiErrorAppend(errs, errors.New(`The only valid ami_architecture values are "arm64", "i386", "x86_64", or "x86_64_mac"`))
+		errs = packersdk.MultiErrorAppend(errs, errors.New(`The only valid ami_architecture values are "arm64", "arm64_mac", "i386", "x86_64", or "x86_64_mac"`))
 	}
 
 	if b.config.TpmSupport != "" && b.config.TpmSupport != ec2.TpmSupportValuesV20 {
diff --git a/docs-partials/builder/chroot/Config-not-required.mdx b/docs-partials/builder/chroot/Config-not-required.mdx
@@ -152,7 +152,7 @@
   prefix `kms_key_id` with `alias/`.
 
 - `ami_architecture` (string) - what architecture to use when registering the final AMI; valid options
-  are "arm64", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".
+  are "arm64", "arm64_mac", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".
 
 - `boot_mode` (string) - The boot mode. Valid options are `legacy-bios` and `uefi`. See the documentation on
   [boot modes](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-boot.html) for
diff --git a/docs-partials/builder/ebssurrogate/Config-not-required.mdx b/docs-partials/builder/ebssurrogate/Config-not-required.mdx
@@ -28,7 +28,7 @@
   will allow you to create those programatically.
 
 - `ami_architecture` (string) - what architecture to use when registering the final AMI; valid options
-  are "arm64", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".
+  are "arm64", "arm64_mac", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".
 
 - `boot_mode` (string) - The boot mode. Valid options are `legacy-bios` and `uefi`. See the documentation on
   [boot modes](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-boot.html) for

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ type Config struct {`
`195`	`195`	// prefix `kms_key_id` with `alias/`.
`196`	`196`	RootVolumeKmsKeyId string `mapstructure:"root_volume_kms_key_id" required:"false"`
`197`	`197`	`// what architecture to use when registering the final AMI; valid options`
`198`		`- // are "arm64", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".`
	`198`	`+ // are "arm64", "arm64_mac", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".`
`199`	`199`	Architecture string `mapstructure:"ami_architecture" required:"false"`
`200`	`200`	// The boot mode. Valid options are `legacy-bios` and `uefi`. See the documentation on
`201`	`201`	`// [boot modes](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-boot.html) for`
`@@ -370,14 +370,14 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {`
`370`	`370`
`371`	`371`	`}`
`372`	`372`	`valid := false`
`373`		`- for _, validArch := range []string{"arm64", "i386", "x86_64", "x86_64_mac"} {`
	`373`	`+ for _, validArch := range []string{"arm64", "arm64_mac", "i386", "x86_64", "x86_64_mac"} {`
`374`	`374`	`if validArch == b.config.Architecture {`
`375`	`375`	`valid = true`
`376`	`376`	`break`
`377`	`377`	`}`
`378`	`378`	`}`
`379`	`379`	`if !valid {`
`380`		- errs = packersdk.MultiErrorAppend(errs, errors.New(`The only valid ami_architecture values are "arm64", "i386", "x86_64", or "x86_64_mac"`))
	`380`	+ errs = packersdk.MultiErrorAppend(errs, errors.New(`The only valid ami_architecture values are "arm64", "arm64_mac", "i386", "x86_64", or "x86_64_mac"`))
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`if b.config.TpmSupport != "" && b.config.TpmSupport != ec2.TpmSupportValuesV20 {`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ type Config struct {`
`71`	`71`	`// will allow you to create those programatically.`
`72`	`72`	VolumeRunTag config.NameValues `mapstructure:"run_volume_tag" required:"false"`
`73`	`73`	`// what architecture to use when registering the final AMI; valid options`
`74`		`- // are "arm64", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".`
	`74`	`+ // are "arm64", "arm64_mac", "i386", "x86_64", or "x86_64_mac". Defaults to "x86_64".`
`75`	`75`	Architecture string `mapstructure:"ami_architecture" required:"false"`
`76`	`76`	// The boot mode. Valid options are `legacy-bios` and `uefi`. See the documentation on
`77`	`77`	`// [boot modes](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-boot.html) for`
`@@ -186,14 +186,14 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {`
`186`	`186`	`b.config.Architecture = "x86_64"`
`187`	`187`	`}`
`188`	`188`	`valid := false`
`189`		`- for _, validArch := range []string{"arm64", "i386", "x86_64", "x86_64_mac"} {`
	`189`	`+ for _, validArch := range []string{"arm64", "arm64_mac", "i386", "x86_64", "x86_64_mac"} {`
`190`	`190`	`if validArch == b.config.Architecture {`
`191`	`191`	`valid = true`
`192`	`192`	`break`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`	`if !valid {`
`196`		- errs = packersdk.MultiErrorAppend(errs, errors.New(`The only valid ami_architecture values are "arm64", "i386", "x86_64", or "x86_64_mac"`))
	`196`	+ errs = packersdk.MultiErrorAppend(errs, errors.New(`The only valid ami_architecture values are "arm64", "arm64_mac", "i386", "x86_64", or "x86_64_mac"`))
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`if b.config.TpmSupport != "" && b.config.TpmSupport != ec2.TpmSupportValuesV20 {`