chore: add ability to select a supported architecture

src/AWS.Deploy.CLI/Commands/DeployCommand.cs

@@ -726,28 +726,29 @@ private async Task ConfigureDeploymentFromCli(Recommendation recommendation, Opt
 
             object currentValue = _optionSettingHandler.GetOptionSettingValue(recommendation, setting);
             object? settingValue = null;
-            if (setting.AllowedValues?.Count > 0)
-            {
-                var userInputConfig = new UserInputConfiguration<string>(
-                    idSelector: x => x,
-                    displaySelector: x => setting.ValueMapping.ContainsKey(x) ? setting.ValueMapping[x] : x,
-                    defaultSelector: x => x.Equals(currentValue))
-                {
-                    CreateNew = false
-                };
 
-                var userResponse = _consoleUtilities.AskUserToChooseOrCreateNew(setting.AllowedValues, string.Empty, userInputConfig);
-                settingValue = userResponse.SelectedOption;
-
-                // If they didn't change the value then don't store so we can rely on using the default in the recipe.
-                if (Equals(settingValue, currentValue))
-                    return;
+            if (setting.TypeHint.HasValue && _typeHintCommandFactory.GetCommand(setting.TypeHint.Value) is var typeHintCommand && typeHintCommand != null)
+            {
+                settingValue = await typeHintCommand.Execute(recommendation, setting);
             }
             else
             {
-                if (setting.TypeHint.HasValue && _typeHintCommandFactory.GetCommand(setting.TypeHint.Value) is var typeHintCommand && typeHintCommand != null)
+                if (setting.AllowedValues?.Count > 0)
                 {
-                    settingValue = await typeHintCommand.Execute(recommendation, setting);
+                    var userInputConfig = new UserInputConfiguration<string>(
+                        idSelector: x => x,
+                        displaySelector: x => setting.ValueMapping.ContainsKey(x) ? setting.ValueMapping[x] : x,
+                        defaultSelector: x => x.Equals(currentValue))
+                    {
+                        CreateNew = false
+                    };
+
+                    var userResponse = _consoleUtilities.AskUserToChooseOrCreateNew(setting.AllowedValues, string.Empty, userInputConfig);
+                    settingValue = userResponse.SelectedOption;
+
+                    // If they didn't change the value then don't store so we can rely on using the default in the recipe.
+                    if (Equals(settingValue, currentValue))
+                        return;
                 }
                 else
                 {

src/AWS.Deploy.CLI/Commands/TypeHints/EnvironmentArchitectureCommand.cs

@@ -0,0 +1,66 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\r
+// SPDX-License-Identifier: Apache-2.0
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using AWS.Deploy.Common;
+using AWS.Deploy.Common.Recipes;
+using AWS.Deploy.Common.TypeHintData;
+
+namespace AWS.Deploy.CLI.Commands.TypeHints
+{
+    public class EnvironmentArchitectureCommand : ITypeHintCommand
+    {
+        private readonly IConsoleUtilities _consoleUtilities;
+        private readonly IOptionSettingHandler _optionSettingHandler;
+
+        public EnvironmentArchitectureCommand(IConsoleUtilities consoleUtilities, IOptionSettingHandler optionSettingHandler)
+        {
+            _consoleUtilities = consoleUtilities;
+            _optionSettingHandler = optionSettingHandler;
+        }
+
+        public Task<TypeHintResourceTable> GetResources(Recommendation recommendation, OptionSettingItem optionSetting)
+        {
+            var resourceTable = new TypeHintResourceTable
+            {
+                Columns = new List<TypeHintResourceColumn>()
+                {
+                    new TypeHintResourceColumn("Architecture")
+                }
+            };
+
+            foreach (var value in recommendation.Recipe.SupportedArchitectures ?? new List<SupportedArchitecture> { SupportedArchitecture.X86_64 })
+            {
+                var stringValue = value.ToString();
+                var row = new TypeHintResource(stringValue, stringValue);
+                row.ColumnValues.Add(stringValue);
+
+                resourceTable.Rows.Add(row);
+            }
+
+            return Task.FromResult(resourceTable);
+        }
+
+        public async Task<object> Execute(Recommendation recommendation, OptionSettingItem optionSetting)
+        {
+            var currentValue = _optionSettingHandler.GetOptionSettingValue(recommendation, optionSetting);
+            var resourceTable = await GetResources(recommendation, optionSetting);
+
+            var userInputConfiguration = new UserInputConfiguration<TypeHintResource>(
+                idSelector: platform => platform.SystemName,
+                displaySelector: platform => platform.DisplayName,
+                defaultSelector: platform => platform.SystemName.Equals(currentValue))
+            {
+                CreateNew = false
+            };
+
+            var userResponse = _consoleUtilities.AskUserToChooseOrCreateNew(resourceTable.Rows, "Select the Platform to use:", userInputConfiguration);
+
+            var result = userResponse.SelectedOption?.SystemName!;
+            recommendation.DeploymentBundle.EnvironmentArchitecture = Enum.Parse<SupportedArchitecture>(result);
+            return result;
+        }
+    }
+}

src/AWS.Deploy.CLI/Commands/TypeHints/TypeHintCommandFactory.cs

@@ -73,6 +73,7 @@ public TypeHintCommandFactory(IServiceProvider serviceProvider, IToolInteractive
                 { OptionSettingTypeHint.FilePath, ActivatorUtilities.CreateInstance<FilePathCommand>(serviceProvider) },
                 { OptionSettingTypeHint.ElasticBeanstalkVpc, ActivatorUtilities.CreateInstance<ElasticBeanstalkVpcCommand>(serviceProvider) },
                 { OptionSettingTypeHint.DockerHttpPort, ActivatorUtilities.CreateInstance<DockerHttpPortCommand>(serviceProvider) },
+                { OptionSettingTypeHint.EnvironmentArchitecture, ActivatorUtilities.CreateInstance<EnvironmentArchitectureCommand>(serviceProvider) },
             };
         }
 

src/AWS.Deploy.Common/DeploymentBundles/DeploymentBundle.cs

@@ -1,6 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+using AWS.Deploy.Common.Recipes;
+
 namespace AWS.Deploy.Common
 {
     /// <summary>
@@ -63,5 +65,10 @@ public class DeploymentBundle
         /// The list of additional dotnet publish args passed to the target application.
         /// </summary>
         public string DotnetPublishAdditionalBuildArguments { get; set; } = "";
+
+        /// <summary>
+        /// The CPU architecture of the environment to create.
+        /// </summary>
+        public SupportedArchitecture EnvironmentArchitecture { get; set; } = SupportedArchitecture.X86_64;
     }
 }

src/AWS.Deploy.Common/Recipes/OptionSettingTypeHint.cs

@@ -40,6 +40,7 @@ public enum OptionSettingTypeHint
         VPCConnector,
         FilePath,
         ElasticBeanstalkVpc,
-        DockerHttpPort
+        DockerHttpPort,
+        EnvironmentArchitecture
     };
 }

src/AWS.Deploy.Common/Recipes/RecipeDefinition.cs

@@ -60,6 +60,11 @@ public class RecipeDefinition
         /// </summary>
         public TargetPlatform? TargetPlatform { get; set; }
 
+        /// <summary>
+        /// The CPU architecture that is supported by the recipe.
+        /// </summary>
+        public List<SupportedArchitecture>? SupportedArchitectures { get; set; }
+
         /// <summary>
         /// The list of DisplayedResources that lists logical CloudFormation IDs with a description.
         /// </summary>

src/AWS.Deploy.Common/Recipes/SupportedArchitecture.cs

@@ -0,0 +1,10 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\r
+// SPDX-License-Identifier: Apache-2.0
+
+namespace AWS.Deploy.Common.Recipes;
+
+public enum SupportedArchitecture
+{
+    X86_64,
+    Arm64
+}

src/AWS.Deploy.Common/Recipes/Validation/OptionSettingItemValidators/RequiredValidator.cs

@@ -19,7 +19,7 @@ public class RequiredValidator : IOptionSettingItemValidator
         public Task<ValidationResult> Validate(object input, Recommendation recommendation, OptionSettingItem optionSettingItem)
         {
             var message = ValidationFailedMessage.Replace("{{OptionSetting}}", optionSettingItem.Name);
-            if (input?.TryDeserialize<SortedSet<string>>(out var inputList) ?? false && inputList != null)
+            if (input?.TryDeserialize<SortedSet<string>>(out var inputList) ?? false)
             {
                 return Task.FromResult<ValidationResult>(new()
                 {

src/AWS.Deploy.Constants/RecipeIdentifier.cs

@@ -22,6 +22,7 @@ internal static class RecipeIdentifier
         public const string REPLACE_TOKEN_HAS_DEFAULT_VPC = "{HasDefaultVpc}";
         public const string REPLACE_TOKEN_HAS_NOT_VPCS = "{HasNotVpcs}";
         public const string REPLACE_TOKEN_DEFAULT_CONTAINER_PORT = "{DefaultContainerPort}";
+        public const string REPLACE_TOKEN_DEFAULT_ENVIRONMENT_ARCHITECTURE = "{DefaultEnvironmentArchitecture}";
 
         /// <summary>
         /// Id for the 'dotnet publish --configuration' recipe option
@@ -38,6 +39,11 @@ internal static class RecipeIdentifier
         /// </summary>
         public const string DotnetPublishSelfContainedBuildOptionId = "SelfContainedBuild";
 
+        /// <summary>
+        /// Id for the environment architecture recipe option
+        /// </summary>
+        public const string EnvironmentArchitectureOptionId = "EnvironmentArchitecture";
+
         public const string TARGET_SERVICE_ELASTIC_BEANSTALK = "AWS Elastic Beanstalk";
     }
 }

src/AWS.Deploy.Orchestration/OptionSettingHandler.cs

@@ -144,6 +144,9 @@ private void SetDeploymentBundleProperty(Recommendation recommendation, OptionSe
                 case Constants.RecipeIdentifier.DotnetPublishSelfContainedBuildOptionId:
                     recommendation.DeploymentBundle.DotnetPublishSelfContainedBuild = Convert.ToBoolean(value);
                     break;
+                case Constants.RecipeIdentifier.EnvironmentArchitectureOptionId:
+                    recommendation.DeploymentBundle.EnvironmentArchitecture = Enum.Parse<SupportedArchitecture>(value.ToString() ?? string.Empty);
+                    break;
                 default:
                     return;
             }

src/AWS.Deploy.Orchestration/Orchestrator.cs

@@ -244,6 +244,14 @@ public async Task ApplyAllReplacementTokens(Recommendation recommendation, strin
                 recommendation.AddReplacementToken(Constants.RecipeIdentifier.REPLACE_TOKEN_DEFAULT_CONTAINER_PORT, defaultPort);
                 recommendation.DeploymentBundle.DockerfileHttpPort = defaultPort;
             }
+            if (recommendation.ReplacementTokens.ContainsKey(Constants.RecipeIdentifier.REPLACE_TOKEN_DEFAULT_ENVIRONMENT_ARCHITECTURE))
+            {
+                if (_dockerEngine == null)
+                    throw new InvalidOperationException($"{nameof(_dockerEngine)} is null as part of the Orchestrator object");
+
+                recommendation.AddReplacementToken(Constants.RecipeIdentifier.REPLACE_TOKEN_DEFAULT_ENVIRONMENT_ARCHITECTURE, SupportedArchitecture.X86_64.ToString());
+                recommendation.DeploymentBundle.EnvironmentArchitecture = SupportedArchitecture.X86_64;
+            }
         }
 
         public async Task DeployRecommendation(CloudApplication cloudApplication, Recommendation recommendation)

src/AWS.Deploy.Recipes/DeploymentBundleDefinitions/Container.deploymentbundle

@@ -1,6 +1,16 @@
 {
     "Type": "Container",
     "Parameters": [
+        {
+            "Id": "EnvironmentArchitecture",
+            "Name": "Environment Architecture",
+            "Description": "The CPU architecture of the environment to create.",
+            "TypeHint": "EnvironmentArchitecture",
+            "Type": "String",
+            "DefaultValue": "{DefaultEnvironmentArchitecture}",
+            "AdvancedSetting": false,
+            "Updatable": true
+        },
         {
             "Id": "DockerBuildArgs",
             "Name": "Docker Build Args",

src/AWS.Deploy.Recipes/DeploymentBundleDefinitions/DotnetPublishZipFile.deploymentbundle

@@ -1,6 +1,16 @@
 {
     "Type": "DotnetPublishZipFile",
     "Parameters": [
+        {
+            "Id": "EnvironmentArchitecture",
+            "Name": "Environment Architecture",
+            "Description": "The CPU architecture of the environment to create.",
+            "TypeHint": "EnvironmentArchitecture",
+            "Type": "String",
+            "DefaultValue": "{DefaultEnvironmentArchitecture}",
+            "AdvancedSetting": false,
+            "Updatable": true
+        },
         {
             "Id": "DotnetBuildConfiguration",
             "Name": "Dotnet Build Configuration",

src/AWS.Deploy.Recipes/RecipeDefinitions/ASP.NETAppAppRunner.recipe

@@ -1,7 +1,7 @@
 {
     "$schema": "./aws-deploy-recipe-schema.json",
     "Id": "AspNetAppAppRunner",
-    "Version": "1.0.2",
+    "Version": "1.0.3",
     "Name": "ASP.NET Core App to AWS App Runner",
     "DeploymentType": "CdkProject",
     "DeploymentBundle": "Container",
@@ -11,6 +11,7 @@
     "Description": "This ASP.NET Core application will be built as a container image on Linux and deployed to AWS App Runner, a fully managed service for web applications and APIs. If your project does not contain a Dockerfile, it will be automatically generated, otherwise an existing Dockerfile will be used. Recommended if you want to deploy your web application as a Linux container image on a fully managed environment.",
     "TargetService": "AWS App Runner",
     "TargetPlatform": "Linux",
+    "SupportedArchitectures": [ "x86_64" ],
 
     "DisplayedResources": [
         {

src/AWS.Deploy.Recipes/RecipeDefinitions/ASP.NETAppECSFargate.recipe

@@ -1,7 +1,7 @@
 {
     "$schema": "./aws-deploy-recipe-schema.json",
     "Id": "AspNetAppEcsFargate",
-    "Version": "1.1.1",
+    "Version": "1.1.2",
     "Name": "ASP.NET Core App to Amazon ECS using AWS Fargate",
     "DeploymentType": "CdkProject",
     "DeploymentBundle": "Container",
@@ -11,6 +11,7 @@
     "Description": "This ASP.NET Core application will be deployed to Amazon Elastic Container Service (Amazon ECS) with compute power managed by AWS Fargate compute engine. If your project does not contain a Dockerfile, it will be automatically generated, otherwise an existing Dockerfile will be used. Recommended if you want to deploy your application as a container image on Linux.",
     "TargetService": "Amazon Elastic Container Service",
     "TargetPlatform": "Linux",
+    "SupportedArchitectures": [ "x86_64" ],
 
     "DisplayedResources": [
         {

src/AWS.Deploy.Recipes/RecipeDefinitions/ASP.NETAppElasticBeanstalkLinux.recipe

@@ -1,7 +1,7 @@
 {
     "$schema": "./aws-deploy-recipe-schema.json",
     "Id": "AspNetAppElasticBeanstalkLinux",
-    "Version": "1.0.2",
+    "Version": "1.0.3",
     "Name": "ASP.NET Core App to AWS Elastic Beanstalk on Linux",
     "DeploymentType": "CdkProject",
     "DeploymentBundle": "DotnetPublishZipFile",
@@ -11,6 +11,7 @@
     "Description": "This ASP.NET Core application will be built and deployed to AWS Elastic Beanstalk on Linux. Recommended if you want to deploy your application directly to EC2 hosts, not as a container image.",
     "TargetService": "AWS Elastic Beanstalk",
     "TargetPlatform": "Linux",
+    "SupportedArchitectures": [ "x86_64" ],
 
     "DisplayedResources": [
         {

src/AWS.Deploy.Recipes/RecipeDefinitions/ASP.NETAppElasticBeanstalkWindows.recipe

@@ -1,7 +1,7 @@
 {
     "$schema": "./aws-deploy-recipe-schema.json",
     "Id": "AspNetAppElasticBeanstalkWindows",
-    "Version": "1.0.2",
+    "Version": "1.0.3",
     "Name": "ASP.NET Core App to AWS Elastic Beanstalk on Windows",
     "DeploymentType": "CdkProject",
     "DeploymentBundle": "DotnetPublishZipFile",
@@ -11,6 +11,7 @@
     "ShortDescription": "ASP.NET Core application deployed to AWS Elastic Beanstalk on Windows.",
     "TargetService": "AWS Elastic Beanstalk",
     "TargetPlatform": "Windows",
+    "SupportedArchitectures": [ "x86_64" ],
 
     "DisplayedResources": [
         {

src/AWS.Deploy.Recipes/RecipeDefinitions/ASP.NETAppExistingBeanstalkEnvironment.recipe

@@ -1,7 +1,7 @@
 {
     "$schema": "./aws-deploy-recipe-schema.json",
     "Id": "AspNetAppExistingBeanstalkEnvironment",
-    "Version": "1.0.1",
+    "Version": "1.0.2",
     "Name": "ASP.NET Core App to Existing AWS Elastic Beanstalk Environment",
     "DisableNewDeployments": true,
     "DeploymentType": "BeanstalkEnvironment",
@@ -10,6 +10,7 @@
     "Description": "This ASP.NET Core application will be built and deployed to an existing AWS Elastic Beanstalk environment. Recommended if you want to deploy your application directly to EC2 hosts, not as a container image.",
     "TargetService": "AWS Elastic Beanstalk",
     "TargetPlatform": "Linux",
+    "SupportedArchitectures": [ "x86_64" ],
 
     "RecipePriority": 0,
     "RecommendationRules": [

src/AWS.Deploy.Recipes/RecipeDefinitions/ASP.NETAppExistingBeanstalkWindowsEnvironment.recipe

@@ -1,7 +1,7 @@
 {
     "$schema": "./aws-deploy-recipe-schema.json",
     "Id": "AspNetAppExistingBeanstalkWindowsEnvironment",
-    "Version": "1.0.0",
+    "Version": "1.0.1",
     "Name": "ASP.NET Core App to Existing AWS Elastic Beanstalk Windows Environment",
     "DisableNewDeployments": true,
     "DeploymentType": "BeanstalkEnvironment",
@@ -10,6 +10,7 @@
     "Description": "This ASP.NET Core application will be built and deployed to an existing AWS Elastic Beanstalk Windows environment. Recommended if you want to deploy your application directly to EC2 hosts, not as a container image.",
     "TargetService": "AWS Elastic Beanstalk",
     "TargetPlatform": "Windows",
+    "SupportedArchitectures": [ "x86_64" ],
 
     "RecipePriority": 0,
     "RecommendationRules": [

src/AWS.Deploy.Recipes/RecipeDefinitions/BlazorWasm.recipe

@@ -1,7 +1,7 @@
 {
     "$schema": "./aws-deploy-recipe-schema.json",
     "Id": "BlazorWasm",
-    "Version": "1.0.1",
+    "Version": "1.0.2",
     "Name": "Blazor WebAssembly App",
     "DeploymentType": "CdkProject",
     "DeploymentBundle": "DotnetPublishZipFile",
@@ -11,6 +11,7 @@
     "Description": "This Blazor WebAssembly application will be built and hosted in a new Amazon Simple Storage Service (Amazon S3) bucket. The Blazor application will be exposed publicly through a CloudFront distribution using the Amazon S3 bucket as the origin.",
     "TargetService": "Amazon S3",
     "TargetPlatform": "Linux",
+    "SupportedArchitectures": [ "x86_64" ],
 
     "DisplayedResources": [
         {

src/AWS.Deploy.Recipes/RecipeDefinitions/ConsoleAppECSFargateScheduleTask.recipe

@@ -1,7 +1,7 @@
 {
     "$schema": "./aws-deploy-recipe-schema.json",
     "Id": "ConsoleAppEcsFargateScheduleTask",
-    "Version": "1.0.2",
+    "Version": "1.0.3",
     "Name": "Scheduled Task on Amazon Elastic Container Service (ECS) using AWS Fargate",
     "DeploymentType": "CdkProject",
     "DeploymentBundle": "Container",
@@ -11,6 +11,7 @@
     "ShortDescription": "Deploys a scheduled task as a Linux container image to a fully managed container orchestration service. Dockerfile will be automatically generated if needed.",
     "TargetService": "Amazon Elastic Container Service",
     "TargetPlatform": "Linux",
+    "SupportedArchitectures": [ "x86_64" ],
 
     "DisplayedResources": [
         {