fix(layers): rename Lambda layer name from x86 to x86_64 (#5226)

sthulb · leandrodamascena · web-flow · commit 727bac138c40 · 2024-10-01T09:59:46.000+01:00
fix: update singular x86 references to x86_64

Co-authored-by: Leandro Damascena &lt;lcdama@amazon.pt&gt;
diff --git a/.github/workflows/publish_v2_layer.yml b/.github/workflows/publish_v2_layer.yml
@@ -2,7 +2,7 @@ name: Deploy v2 layer to all regions
 
 # PROCESS
 #
-# 1. Compile Layer using cdk-aws-lambda-powertools-layer CDK construct for x86 and ARM (uses custom runner as it's CPU heavy)
+# 1. Compile Layer using cdk-aws-lambda-powertools-layer CDK construct for x86_64 and ARM (uses custom runner as it's CPU heavy)
 # 2. Kick off pipeline for beta, prod, and canary releases
 # 3. Create PR to update trunk so staged docs also point to the latest Layer ARN, when merged
 # 4. Builds and publishes docs with latest Layer ARN using given version (generally coming from release)
diff --git a/.github/workflows/publish_v3_layer.yml b/.github/workflows/publish_v3_layer.yml
@@ -2,7 +2,7 @@ name: Deploy v3 layer to all regions
 
 # PROCESS
 #
-# 1. Compile Layer using cdk-aws-lambda-powertools-layer CDK construct for Python3.8-3.12 and x86/ARM architectures (uses custom runner as it's CPU heavy)
+# 1. Compile Layer using cdk-aws-lambda-powertools-layer CDK construct for Python3.8-3.12 and x86_64/ARM architectures (uses custom runner as it's CPU heavy)
 # 2. Kick off pipeline for beta, prod, and canary releases
 # 3. Create PR to update trunk so staged docs also point to the latest Layer ARN, when merged
 # 4. Builds and publishes docs with latest Layer ARN using given version (generally coming from release)
diff --git a/docs/diagram_src/cicd_steps.md b/docs/diagram_src/cicd_steps.md
@@ -83,7 +83,7 @@ timeline
                                 : Create PR
 
     Lambda Layers               : Fetch PyPi release
-                                : Build x86 architecture
+                                : Build x86_64 architecture
                                 : Build ARM architecture
                                 : Deploy Beta
                                 : Canary testing
diff --git a/docs/includes/_layer_homepage_x86.md b/docs/includes/_layer_homepage_x86.md
diff --git a/docs/index.md b/docs/index.md
@@ -69,7 +69,7 @@ You can install Powertools for AWS Lambda (Python) using your favorite dependenc
 
     | Architecture | Layer ARN                                                                                                 |
     | ------------ | --------------------------------------------------------------------------------------------------------- |
-    | x86          | __arn:aws:lambda:{region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-{python_version}-x86:1__{: .copyMe}:clipboard:       |
+    | x86_64          | __arn:aws:lambda:{region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-{python_version}-x86_64:1__{: .copyMe}:clipboard:       |
     | ARM          | __arn:aws:lambda:{region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-{python_version}-arm64:1__{: .copyMe}:clipboard: |
 
     === "AWS Console"
@@ -166,7 +166,7 @@ You can install Powertools for AWS Lambda (Python) using your favorite dependenc
         You can use AWS CLI to generate a pre-signed URL to download the contents of our Lambda Layer.
 
         ```bash title="AWS CLI command to download Lambda Layer content"
-        aws lambda get-layer-version-by-arn --arn arn:aws:lambda:eu-west-1:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86:1 --region eu-west-1
+        aws lambda get-layer-version-by-arn --arn arn:aws:lambda:eu-west-1:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86_64:1 --region eu-west-1
         ```
 
         You'll find the pre-signed URL under `Location` key as part of the CLI command output.
@@ -247,7 +247,7 @@ In this context, `[aws-sdk]` is an alias to the `boto3` package. Due to dependen
 
 ### Lambda Layer
 
-[Lambda Layer](https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html){target="_blank"} is a .zip file archive that can contain additional code, pre-packaged dependencies, data,  or configuration files. We compile and optimize [all dependencies](#install) for Python versions from **3.8 to 3.12**, as well as for both **arm64 and x86** architectures, to ensure compatibility. We also remove duplicate dependencies [already available in the Lambda runtime](https://github.com/aws-powertools/powertools-lambda-layer-cdk/blob/d24716744f7d1f37617b4998c992c4c067e19e64/layer/Python/Dockerfile#L36){target="_blank"} to achieve the most optimal size.
+[Lambda Layer](https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html){target="_blank"} is a .zip file archive that can contain additional code, pre-packaged dependencies, data,  or configuration files. We compile and optimize [all dependencies](#install) for Python versions from **3.8 to 3.12**, as well as for both **arm64 and x86_64** architectures, to ensure compatibility. We also remove duplicate dependencies [already available in the Lambda runtime](https://github.com/aws-powertools/powertools-lambda-layer-cdk/blob/d24716744f7d1f37617b4998c992c4c067e19e64/layer/Python/Dockerfile#L36){target="_blank"} to achieve the most optimal size.
 
 === "x86_64"
     --8<-- "docs/includes/_layer_homepage_x86.md"
@@ -260,7 +260,7 @@ In this context, `[aws-sdk]` is an alias to the `boto3` package. Due to dependen
 The pre-signed URL to download this Lambda Layer will be within `Location` key in the CLI output. The CLI output will also contain the Powertools for AWS Lambda version it contains.
 
 ```bash title="AWS CLI command to download Lambda Layer content"
-aws lambda get-layer-version-by-arn --arn arn:aws:lambda:eu-west-1:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86:1 --region eu-west-1
+aws lambda get-layer-version-by-arn --arn arn:aws:lambda:eu-west-1:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86_64:1 --region eu-west-1
 ```
 
 #### SAR
@@ -489,7 +489,7 @@ Knowing which companies are using this library is important to help prioritize t
 
 <!-- markdownlint-disable MD051 -->
 
-When [using Layers](#lambda-layer), you can add Powertools for AWS Lambda (Python) as a dev dependency to not impact the development process. For Layers, we pre-package all dependencies, compile and optimize for storage and both x86 and ARM architecture.
+When [using Layers](#lambda-layer), you can add Powertools for AWS Lambda (Python) as a dev dependency to not impact the development process. For Layers, we pre-package all dependencies, compile and optimize for storage and both x86_64 and ARM architecture.
 
 <!-- markdownlint-enable MD051 -->
 
diff --git a/docs/maintainers.md b/docs/maintainers.md
@@ -206,7 +206,7 @@ section Git release
     Upload attestation          : active, 8s
 
 section Layer release
-    Build (x86+ARM)             : active, layer_build, 10:08, 6m
+    Build (x86_64+ARM)             : active, layer_build, 10:08, 6m
     Deploy Beta                 : active, layer_beta, after layer_build, 6.3m
     Deploy Prod                 : active, layer_prod, after layer_beta, 6.3m
 
diff --git a/docs/roadmap.md b/docs/roadmap.md
@@ -248,7 +248,7 @@ AWS Lambda will officially block updates to Lambda functions using Python 3.7 su
 
 We want to publish a JSON with a map of region and Lambda Layer ARN as a GitHub Release Note asset.
 
-As of V2, we prioritize Lambda Layers being available before release notes are out. This is due to X86 and ARM64 compilation for smaller binaries and extra speed.
+As of V2, we prioritize Lambda Layers being available before release notes are out. This is due to x86_64 and ARM64 compilation for smaller binaries and extra speed.
 
 This means we have room to include a JSON map for Lambda Layers and facilitate automation for customers wanting the latest version as soon as it's available.
 
diff --git a/examples/homepage/install/sar/cdk_sar.py b/examples/homepage/install/sar/cdk_sar.py
@@ -5,7 +5,7 @@
 # Find latest from github.com/aws-powertools/powertools-lambda-python/releases
 POWERTOOLS_VER = "3.0.0"
 POWERTOOLS_ARN = (
-    "arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer-v3-python312-x86"
+    "arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer-v3-python312-x86_64"
 )
 
 
diff --git a/examples/homepage/install/sar/sam.yaml b/examples/homepage/install/sar/sam.yaml
@@ -6,7 +6,7 @@ Resources:
       Type: AWS::Serverless::Application
       Properties:
           Location:
-              ApplicationId: arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer-v3-python312-x86
+              ApplicationId: arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer-v3-python312-x86_64
               SemanticVersion: 3.0.0 # change to latest semantic version available in SAR
 
   MyLambdaFunction:
diff --git a/examples/homepage/install/sar/scoped_down_iam.yaml b/examples/homepage/install/sar/scoped_down_iam.yaml
@@ -33,7 +33,7 @@
                         - serverlessrepo:GetCloudFormationTemplate
                       Resource:
                         # this is arn of the Powertools for AWS Lambda (Python) SAR app
-                        - arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer-v3-python312-x86
+                        - arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer-v3-python312-x86_64
                     - Sid: S3AccessLayer
                       Effect: Allow
                       Action:
diff --git a/examples/homepage/install/sar/serverless.yml b/examples/homepage/install/sar/serverless.yml
@@ -16,5 +16,5 @@ resources:
       Type: AWS::Serverless::Application
       Properties:
         Location:
-          ApplicationId:  arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer-v3-python312-x86
+          ApplicationId:  arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer-v3-python312-x86_64
           SemanticVersion: 2.0.0
diff --git a/examples/homepage/install/sar/terraform.tf b/examples/homepage/install/sar/terraform.tf
@@ -21,7 +21,7 @@ resource "aws_serverlessapplicationrepository_cloudformation_stack" "deploy_sar_
 }
 
 data "aws_serverlessapplicationrepository_application" "sar_app" {
-  application_id   = "arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer-v3-python312-x86"
+  application_id   = "arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer-v3-python312-x86_64"
   semantic_version = var.aws_powertools_version
 }
 
diff --git a/examples/homepage/install/x86_64/amplify.txt b/examples/homepage/install/x86_64/amplify.txt
@@ -6,7 +6,7 @@
 ? Do you want to configure advanced settings? Yes
 ...
 ? Do you want to enable Lambda layers for this function? Yes
-? Enter up to 5 existing Lambda layer ARNs (comma-separated): arn:aws:lambda:eu-central-1:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86:1
+? Enter up to 5 existing Lambda layer ARNs (comma-separated): arn:aws:lambda:eu-central-1:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86_64:1
 ❯ amplify push -y
 
 
@@ -17,5 +17,5 @@ General information
 - Name: <NAME-OF-FUNCTION>
 ? Which setting do you want to update? Lambda layers configuration
 ? Do you want to enable Lambda layers for this function? Yes
-? Enter up to 5 existing Lambda layer ARNs (comma-separated): arn:aws:lambda:eu-central-1:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86:1
+? Enter up to 5 existing Lambda layer ARNs (comma-separated): arn:aws:lambda:eu-central-1:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86_64:1
 ? Do you want to edit the local lambda function now? No
diff --git a/examples/homepage/install/x86_64/cdk_x86.py b/examples/homepage/install/x86_64/cdk_x86.py
@@ -10,7 +10,7 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
         powertools_layer = aws_lambda.LayerVersion.from_layer_version_arn(
             self,
             id="lambda-powertools",
-            layer_version_arn=f"arn:aws:lambda:{Aws.REGION}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86:1",
+            layer_version_arn=f"arn:aws:lambda:{Aws.REGION}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86_64:1",
         )
         aws_lambda.Function(
             self,
diff --git a/examples/homepage/install/x86_64/pulumi_x86.py b/examples/homepage/install/x86_64/pulumi_x86.py
@@ -22,7 +22,7 @@
         pulumi.Output.concat(
             "arn:aws:lambda:",
             aws.get_region_output().name,
-            ":017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86:1",
+            ":017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86_64:1",
         ),
     ],
     tracing_config={"mode": "Active"},
diff --git a/examples/homepage/install/x86_64/sam.yaml b/examples/homepage/install/x86_64/sam.yaml
@@ -8,4 +8,4 @@ Resources:
             Runtime: python3.12
             Handler: app.lambda_handler
             Layers:
-            - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86:1
+            - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86_64:1
diff --git a/examples/homepage/install/x86_64/serverless.yml b/examples/homepage/install/x86_64/serverless.yml
@@ -10,4 +10,4 @@ functions:
     handler: lambda_function.lambda_handler
     architecture: arm64
     layers:
-    - arn:aws:lambda:${aws:region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86:1
+    - arn:aws:lambda:${aws:region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86_64:1
diff --git a/examples/homepage/install/x86_64/terraform.tf b/examples/homepage/install/x86_64/terraform.tf
@@ -34,7 +34,7 @@ resource "aws_lambda_function" "test_lambda" {
   role          = aws_iam_role.iam_for_lambda.arn
   handler       = "index.test"
   runtime       = "python3.12"
-  layers        = ["arn:aws:lambda:{region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86:1"]
+  layers        = ["arn:aws:lambda:{region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86_64:1"]
 
   source_code_hash = filebase64sha256("lambda_function_payload.zip")
 }
diff --git a/examples/logger/sam/template.yaml b/examples/logger/sam/template.yaml
@@ -14,7 +14,7 @@ Globals:
     Layers:
       # Find the latest Layer version in the official documentation
       # https://docs.powertools.aws.dev/lambda/python/latest/#lambda-layer
-      - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86:1
+      - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86_64:1
 
 Resources:
   LoggerLambdaHandlerExample:
diff --git a/examples/metrics/sam/template.yaml b/examples/metrics/sam/template.yaml
@@ -15,7 +15,7 @@ Globals:
     Layers:
       # Find the latest Layer version in the official documentation
       # https://docs.powertools.aws.dev/lambda/python/latest/#lambda-layer
-      - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86:1
+      - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86_64:1
 
 Resources:
   CaptureLambdaHandlerExample:
diff --git a/examples/metrics_datadog/sam/template.yaml b/examples/metrics_datadog/sam/template.yaml
@@ -20,7 +20,7 @@ Globals:
     Layers:
       # Find the latest Layer version in the official documentation
       # https://docs.powertools.aws.dev/lambda/python/latest/#lambda-layer
-      - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86:1
+      - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86_64:1
       # Find the latest Layer version in the Datadog official documentation
 
       # Datadog SDK
diff --git a/examples/tracer/sam/template.yaml b/examples/tracer/sam/template.yaml
@@ -13,7 +13,7 @@ Globals:
     Layers:
       # Find the latest Layer version in the official documentation
       # https://docs.powertools.aws.dev/lambda/python/latest/#lambda-layer
-      - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86:1
+      - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPythonV3-python312-x86_64:1
 
 Resources:
   CaptureLambdaHandlerExample:
diff --git a/layer_v3/app.py b/layer_v3/app.py
@@ -10,7 +10,7 @@
 POWERTOOLS_VERSION: str = app.node.try_get_context("version")
 PYTHON_VERSION: str = app.node.try_get_context("pythonVersion")
 PYTHON_VERSION_NORMALIZED = PYTHON_VERSION.replace(".", "")
-SSM_PARAM_LAYER_ARN: str = f"/layers/powertools-layer-v3-{PYTHON_VERSION_NORMALIZED}-x86-arn"
+SSM_PARAM_LAYER_ARN: str = f"/layers/powertools-layer-v3-{PYTHON_VERSION_NORMALIZED}-x86_64-arn"
 SSM_PARAM_LAYER_ARM64_ARN: str = f"/layers/powertools-layer-v3-{PYTHON_VERSION_NORMALIZED}-arm64-arn"
 
 # Validate context variables
diff --git a/layer_v3/layer/layer_stack.py b/layer_v3/layer/layer_stack.py
@@ -80,7 +80,7 @@ def __init__(
         super().__init__(scope, construct_id, **kwargs)
 
         python_version_normalized = python_version.replace(".", "")
-        layer_name_x86 = f"AWSLambdaPowertoolsPythonV3-{python_version_normalized}-x86"
+        layer_name_x86_64 = f"AWSLambdaPowertoolsPythonV3-{python_version_normalized}-x86_64"
         layer_name_arm64 = f"AWSLambdaPowertoolsPythonV3-{python_version_normalized}-arm64"
 
         if python_version == "python3.8":
@@ -119,7 +119,7 @@ def __init__(
         layer_single = Layer(
             self,
             f"LayerSingle-{python_version_normalized}",
-            layer_version_name=layer_name_x86,
+            layer_version_name=layer_name_x86_64,
             python_version=python_version,
             powertools_version=powertools_version,
         )
@@ -142,7 +142,7 @@ def __init__(
         layer = Layer(
             self,
             f"Layer-{python_version_normalized}",
-            layer_version_name=layer_name_x86,
+            layer_version_name=layer_name_x86_64,
             powertools_version=powertools_version,
             python_version=python_version,
             architecture=Architecture.X86_64,

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ name: Deploy v2 layer to all regions`
`2`	`2`
`3`	`3`	`# PROCESS`
`4`	`4`	`#`
`5`		`-# 1. Compile Layer using cdk-aws-lambda-powertools-layer CDK construct for x86 and ARM (uses custom runner as it's CPU heavy)`
	`5`	`+# 1. Compile Layer using cdk-aws-lambda-powertools-layer CDK construct for x86_64 and ARM (uses custom runner as it's CPU heavy)`
`6`	`6`	`# 2. Kick off pipeline for beta, prod, and canary releases`
`7`	`7`	`# 3. Create PR to update trunk so staged docs also point to the latest Layer ARN, when merged`
`8`	`8`	`# 4. Builds and publishes docs with latest Layer ARN using given version (generally coming from release)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ name: Deploy v3 layer to all regions`
`2`	`2`
`3`	`3`	`# PROCESS`
`4`	`4`	`#`
`5`		`-# 1. Compile Layer using cdk-aws-lambda-powertools-layer CDK construct for Python3.8-3.12 and x86/ARM architectures (uses custom runner as it's CPU heavy)`
	`5`	`+# 1. Compile Layer using cdk-aws-lambda-powertools-layer CDK construct for Python3.8-3.12 and x86_64/ARM architectures (uses custom runner as it's CPU heavy)`
`6`	`6`	`# 2. Kick off pipeline for beta, prod, and canary releases`
`7`	`7`	`# 3. Create PR to update trunk so staged docs also point to the latest Layer ARN, when merged`
`8`	`8`	`# 4. Builds and publishes docs with latest Layer ARN using given version (generally coming from release)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`# Find latest from github.com/aws-powertools/powertools-lambda-python/releases`
`6`	`6`	`POWERTOOLS_VER = "3.0.0"`
`7`	`7`	`POWERTOOLS_ARN = (`
`8`		`- "arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer-v3-python312-x86"`
	`8`	`+ "arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer-v3-python312-x86_64"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`