some tlc

Author: kisst

.github/workflows/ci.yml

@@ -0,0 +1,50 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  lint-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.14"
+
+      - name: Install yq
+        run: |
+          sudo wget -qO /usr/local/bin/yq \
+            https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64
+          sudo chmod +x /usr/local/bin/yq
+          yq --version
+
+      - name: Install Python tooling
+        run: |
+          python -m pip install --upgrade pip
+          pip install ruff yamllint cfn-lint pytest pyyaml botocore
+
+      - name: Ruff lint
+        run: ruff check .
+
+      - name: Ruff format check
+        run: ruff format --check .
+
+      - name: yamllint
+        run: yamllint .
+
+      - name: cfn-lint
+        run: cfn-lint CFN-CR-PythonLambdaLayer.yaml CFN-CR-PythonLambdaLayer-SampleUsage.yaml
+
+      - name: Embedded code matches tracked file
+        run: python scripts/check_embedded_code.py
+
+      - name: pytest
+        run: pytest -v

.gitignore

@@ -0,0 +1,4 @@
+__pycache__/
+*.py[cod]
+.pytest_cache/
+.ruff_cache/

.yamllint.yml

@@ -0,0 +1,18 @@
+extends: default
+
+rules:
+  line-length:
+    max: 160
+    level: warning
+  # CFN templates and their inline scripts break default indentation rules;
+  # relax to avoid false positives on block scalars.
+  indentation:
+    spaces: 2
+    indent-sequences: consistent
+  # The inline ZipFile uses trailing whitespace we don't control.
+  trailing-spaces: disable
+  comments:
+    min-spaces-from-content: 1
+  document-start: disable
+  truthy:
+    check-keys: false

CFN-CR-PythonLambdaLayer-SampleUsage.yaml

@@ -12,41 +12,47 @@ Resources:
   EmptyLambdaLayer:
     Properties:
       ServiceToken:
-        Fn::ImportValue: !Sub "cfn:lambdalayer:${AWS::Region}:arn"
+        Fn::ImportValue: !Sub "cfn:lambdalayer-x86-64:${AWS::Region}:arn"
       Name: test-gracefull-exit
-      Region: !Ref "AWS::Region"
     Type: Custom::LayerBuilder
 
   Boto3LambdaLayer:
     Properties:
       ServiceToken:
-        Fn::ImportValue: !Sub "cfn:lambdalayer:${AWS::Region}:arn"
+        Fn::ImportValue: !Sub "cfn:lambdalayer-x86-64:${AWS::Region}:arn"
       Name: boto3-latest
-      Region: !Ref "AWS::Region"
       requirements:
         - boto3
     Type: Custom::LayerBuilder
 
-  TropoLambdaLayer:
+  RequestsLambdaLayer:
     Properties:
       ServiceToken:
-        Fn::ImportValue: !Sub "cfn:lambdalayer:${AWS::Region}:arn"
-      Name: cfn-account-policy
-      Region: !Ref "AWS::Region"
+        Fn::ImportValue: !Sub "cfn:lambdalayer-x86-64:${AWS::Region}:arn"
+      Name: requests-latest
       requirements:
-        - "troposphere>2.3.0"
-        - "awacs==0.7.2"
+        - requests
+    Type: Custom::LayerBuilder
+
+  # Pydantic has a compiled pydantic-core dependency; the builder's arch must
+  # match the consumer function's arch. x86_64 builder → x86_64 consumer.
+  PydanticLambdaLayer:
+    Properties:
+      ServiceToken:
+        Fn::ImportValue: !Sub "cfn:lambdalayer-x86-64:${AWS::Region}:arn"
+      Name: pydantic-latest
+      requirements:
+        - pydantic
     Type: Custom::LayerBuilder
 
   InlineCodeLambdaLayer:
     Properties:
       ServiceToken:
-        Fn::ImportValue: !Sub "cfn:lambdalayer:${AWS::Region}:arn"
+        Fn::ImportValue: !Sub "cfn:lambdalayer-x86-64:${AWS::Region}:arn"
       Name: inline-code-only
-      Region: !Ref "AWS::Region"
       filename: eratosthenes.py
       filecontent:
-        Fn::Base64: !Sub |
+        Fn::Base64: |
           def sieve(n):
             # https://wikipedia.org/wiki/Sieve_of_Eratosthenes
             return sorted(
@@ -61,19 +67,29 @@ Resources:
   InlineCodeWithPipPackageLambdaLayer:
     Properties:
       ServiceToken:
-        Fn::ImportValue: !Sub "cfn:lambdalayer:${AWS::Region}:arn"
+        Fn::ImportValue: !Sub "cfn:lambdalayer-x86-64:${AWS::Region}:arn"
       Name: inline-code-and-requirements
-      Region: !Ref "AWS::Region"
       requirements:
         - python-whois
       filename: module.py
       filecontent:
-        Fn::Base64: !Sub |
+        Fn::Base64: |
           from whois import whois
           def examine(domain):
             return whois(domain)
     Type: Custom::LayerBuilder
 
+  # Same requirements, different arch: call the arm64 builder. C extensions
+  # get built natively for arm64 so Graviton consumer functions work.
+  Arm64BotoLambdaLayer:
+    Properties:
+      ServiceToken:
+        Fn::ImportValue: !Sub "cfn:lambdalayer-arm64:${AWS::Region}:arn"
+      Name: boto3-latest-arm64
+      requirements:
+        - boto3
+    Type: Custom::LayerBuilder
+
   LambdaExecutionRole:
     Type: 'AWS::IAM::Role'
     Properties:
@@ -105,24 +121,25 @@ Resources:
       Description: 'Show lib version from the layers'
       Code:
         ZipFile: |
-          import troposphere
           import boto3
+          import pydantic
+          import requests
           from lambdalayer.module import examine
           from lambdalayer.eratosthenes import sieve
 
           def lambda_handler(event, context):
-              print("Tropo version: {}".format(troposphere.__version__))
-              print("Boto3 version: {}".format(boto3.__version__))
-              print("Sieve of Eratosthenes from 10: {}".format(sieve(10)))
-              print("WhoIs example.com:  {}".format(examine('example.com')))
-              
-              
+              print(f"boto3 version:    {boto3.__version__}")
+              print(f"pydantic version: {pydantic.VERSION}")
+              print(f"requests version: {requests.__version__}")
+              print(f"Sieve of Eratosthenes from 10: {sieve(10)}")
+              print(f"WhoIs example.com: {examine('example.com')}")
       Handler: index.lambda_handler
-      Runtime: python3.7
+      Runtime: python3.14
       Timeout: 60
       Role: !GetAtt LambdaExecutionRole.Arn
       Layers:
         - !GetAtt Boto3LambdaLayer.Arn
-        - !GetAtt TropoLambdaLayer.Arn
+        - !GetAtt RequestsLambdaLayer.Arn
+        - !GetAtt PydanticLambdaLayer.Arn
         - !GetAtt InlineCodeWithPipPackageLambdaLayer.Arn
         - !GetAtt InlineCodeLambdaLayer.Arn