PR-1123 Add Support for Graviton 2 / ARM Architecture (conflict fix)

README.md

@@ -891,6 +891,7 @@ to change Zappa's behavior. Use these at your own risk!
         "assume_policy": "my_assume_policy.json", // optional, IAM assume policy JSON file
         "attach_policy": "my_attach_policy.json", // optional, IAM attach policy JSON file
         "apigateway_policy": "my_apigateway_policy.json", // optional, API Gateway resource policy JSON file
+        "architecture": "x86_64", // optional, Set Lambda Architecture, defaults to x86_64. For Graviton 2 use: arm64
         "async_source": "sns", // Source of async tasks. Defaults to "lambda"
         "async_resources": true, // Create the SNS topic and DynamoDB table to use. Defaults to true.
         "async_response_table": "your_dynamodb_table_name",  // the DynamoDB table name to use for captured async responses; defaults to None (can't capture)

zappa/cli.py

@@ -121,6 +121,7 @@ class ZappaCLI:
     additional_text_mimetypes = None
     tags = []
     layers = None
+    architecture = None
 
     stage_name_env_pattern = re.compile("^[a-zA-Z0-9_]+$")
 
@@ -818,6 +819,7 @@ def deploy(self, source_zip=None, docker_image_uri=None):
                 use_alb=self.use_alb,
                 layers=self.layers,
                 concurrency=self.lambda_concurrency,
+                architecture=self.architecture,
             )
             kwargs["function_name"] = self.lambda_name
             if docker_image_uri:
@@ -1022,6 +1024,7 @@ def update(self, source_zip=None, no_upload=False, docker_image_uri=None):
             function_name=self.lambda_name,
             num_revisions=self.num_retained_versions,
             concurrency=self.lambda_concurrency,
+            architecture=self.architecture,
         )
         if docker_image_uri:
             kwargs["docker_image_uri"] = docker_image_uri
@@ -1058,6 +1061,7 @@ def update(self, source_zip=None, no_upload=False, docker_image_uri=None):
             aws_kms_key_arn=self.aws_kms_key_arn,
             layers=self.layers,
             wait=False,
+            architecture=self.architecture,
         )
 
         # Finally, delete the local copy our zip package
@@ -2248,7 +2252,7 @@ def load_settings(self, settings_file=None, session=None):
         self.dead_letter_config = {"TargetArn": dead_letter_arn} if dead_letter_arn else {}
         self.cognito = self.stage_config.get("cognito", None)
         self.num_retained_versions = self.stage_config.get("num_retained_versions", None)
-
+        self.architecture = [self.stage_config.get("architecture", "x86_64")]
         # Check for valid values of num_retained_versions
         if self.num_retained_versions is not None and type(self.num_retained_versions) is not int:
             raise ClickException(
@@ -2305,6 +2309,9 @@ def load_settings(self, settings_file=None, session=None):
         # Additional tags
         self.tags = self.stage_config.get("tags", {})
 
+        # Architectures
+        self.architecture = [self.stage_config.get("architecture", "x86_64")]
+
         desired_role_name = self.lambda_name + "-ZappaLambdaExecutionRole"
         self.zappa = Zappa(
             boto_session=session,
@@ -2317,6 +2324,7 @@ def load_settings(self, settings_file=None, session=None):
             tags=self.tags,
             endpoint_urls=self.stage_config.get("aws_endpoint_urls", {}),
             xray_tracing=self.xray_tracing,
+            architecture=self.architecture,
         )
 
         for setting in CUSTOM_SETTINGS:

zappa/core.py

@@ -265,7 +265,7 @@ class Zappa:
     apigateway_policy = None
     cloudwatch_log_levels = ["OFF", "ERROR", "INFO"]
     xray_tracing = False
-
+    architecture = None
     ##
     # Credentials
     ##
@@ -285,6 +285,7 @@ def __init__(
         tags=(),
         endpoint_urls={},
         xray_tracing=False,
+        architecture=None,
     ):
         """
         Instantiate this new Zappa instance, loading any custom credentials if necessary.
@@ -315,13 +316,18 @@ def __init__(
         else:
             self.manylinux_suffix_start = "cp39"
 
+        self.architecture = architecture
+        if not self.architecture:
+            self.architecture = "x86_64"
+
         # AWS Lambda supports manylinux1/2010, manylinux2014, and manylinux_2_24
         manylinux_suffixes = ("_2_24", "2014", "2010", "1")
         self.manylinux_wheel_file_match = re.compile(
-            rf'^.*{self.manylinux_suffix_start}-(manylinux_\d+_\d+_x86_64[.])?manylinux({"|".join(manylinux_suffixes)})_x86_64[.]whl$'  # noqa: E501
+            rf"^.*{self.manylinux_suffix_start}-(manylinux_\d+_\d+_{self.architecture}"
+            rf'[.])?manylinux({"|".join(manylinux_suffixes)})_{self.architecture}[.]whl$'
         )
         self.manylinux_wheel_abi3_file_match = re.compile(
-            rf'^.*cp3.-abi3-manylinux({"|".join(manylinux_suffixes)})_x86_64.whl$'
+            f'^.*cp3.-abi3-manylinux({"|".join(manylinux_suffixes)})_{self.architecture}.whl$'
         )
 
         self.endpoint_urls = endpoint_urls
@@ -1120,6 +1126,7 @@ def create_lambda_function(
         layers=None,
         concurrency=None,
         docker_image_uri=None,
+        architecture=None,
     ):
         """
         Given a bucket and key (or a local path) of a valid Lambda-zip,
@@ -1137,6 +1144,8 @@ def create_lambda_function(
             aws_kms_key_arn = ""
         if not layers:
             layers = []
+        if not architecture:
+            architecture = self.architecture
 
         kwargs = dict(
             FunctionName=function_name,
@@ -1151,6 +1160,9 @@ def create_lambda_function(
             KMSKeyArn=aws_kms_key_arn,
             TracingConfig={"Mode": "Active" if self.xray_tracing else "PassThrough"},
             Layers=layers,
+            Architectures=[
+                architecture,
+            ],
         )
         if not docker_image_uri:
             kwargs["Runtime"] = runtime
@@ -1209,6 +1221,7 @@ def update_lambda_function(
         num_revisions=None,
         concurrency=None,
         docker_image_uri=None,
+        architecture=None,
     ):
         """
         Given a bucket and key (or a local path) of a valid Lambda-zip,
@@ -1299,6 +1312,7 @@ def update_lambda_configuration(
         aws_kms_key_arn=None,
         layers=None,
         wait=True,
+        architecture=None,
     ):
         """
         Given an existing function ARN, update the configuration variables.