docs(index): Extract and fix sam templates

Author: Michael Brewer

Makefile

@@ -93,19 +93,16 @@ mypy:
 
 format-examples:
 	poetry run isort docs/examples
-	poetry run black docs/examples/*.py
 	poetry run black docs/examples/*/*.py
 	poetry run black docs/examples/*/*/*.py
 	poetry run black docs/examples/*/*/*/*.py
 	poetry run black docs/examples/*/*/*/*/*.py
 
 lint-examples:
-	poetry run python3 -m py_compile docs/examples/*.py
 	poetry run python3 -m py_compile docs/examples/*/*.py
 	poetry run python3 -m py_compile docs/examples/*/*/*.py
 	poetry run python3 -m py_compile docs/examples/*/*/*/*.py
 	poetry run python3 -m py_compile docs/examples/*/*/*/*/*.py
-	cfn-lint docs/examples/*.yml
 	cfn-lint docs/examples/*/*.yml
 	cfn-lint docs/examples/*/*/*.yml
 	cfn-lint docs/examples/*/*/*/*.yml

docs/examples/core/event_handler/api_gateway/layout/template.yml

@@ -23,7 +23,7 @@ Resources:
             CodeUri: src
             Layers:
                 # Latest version: https://awslabs.github.io/aws-lambda-powertools-python/latest/#lambda-layer
-                - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPython:11
+                - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPython:13
             Events:
                 ByUser:
                     Type: Api

docs/examples/core/event_handler/api_gateway/template.yml

@@ -13,7 +13,7 @@ Globals:
       - '*~1*'  # converts to */* for any binary type
   Function:
     Timeout: 5
-    Runtime: python3.8
+    Runtime: python3.9
     Tracing: Active
     Environment:
       Variables:

docs/examples/core/event_handler/appsync/template.yml

@@ -5,7 +5,7 @@ Description: Hello world Direct Lambda Resolver
 Globals:
   Function:
     Timeout: 5
-    Runtime: python3.8
+    Runtime: python3.9
     Tracing: Active
     Environment:
         Variables:

docs/examples/cdk_app.py renamed to docs/examples/index/lambda_layer_cdk_app.py

@@ -0,0 +1,11 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Resources:
+  MyLambdaFunction:
+      Type: AWS::Serverless::Function
+      Properties:
+          CodeUri: src
+          Handler: app.lambda_handler
+          Runtime: python3.9
+          Layers:
+              - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPython:13

docs/examples/main.tf renamed to docs/examples/index/lambda_layer_main.tf

@@ -4,7 +4,7 @@
 
 POWERTOOLS_BASE_NAME = "AWSLambdaPowertools"
 # Find latest from github.com/awslabs/aws-lambda-powertools-python/releases
-POWERTOOLS_VER = "1.23.0"
+POWERTOOLS_VER = "1.25.3"
 POWERTOOLS_ARN = "arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer"
 
 

docs/examples/index/lambda_layer_template.yml

@@ -27,7 +27,7 @@ data "aws_serverlessapplicationrepository_application" "sar_app" {
 
 variable "aws_powertools_version" {
   type        = string
-  default     = "1.20.2"
+  default     = "1.25.3"
   description = "The AWS Powertools release version"
 }
 

docs/examples/least_priviledged_template.yml renamed to docs/examples/index/least_priviledged_template.yml

@@ -0,0 +1,19 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Resources:
+  AwsLambdaPowertoolsPythonLayer:
+      Type: AWS::Serverless::Application
+      Properties:
+          Location:
+              ApplicationId: arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer
+              SemanticVersion: 1.25.3 # change to latest semantic version available in SAR
+
+  MyLambdaFunction:
+      Type: AWS::Serverless::Function
+      Properties:
+          CodeUri: src
+          Handler: app.lambda_handler
+          Runtime: python3.9
+          Layers:
+              # fetch Layer ARN from SAR App stack output
+              - !GetAtt AwsLambdaPowertoolsPythonLayer.Outputs.LayerVersionArn

docs/examples/sar_cdk_app.py renamed to docs/examples/index/sar_cdk_app.py

@@ -57,12 +57,8 @@ You can include Lambda Powertools Lambda Layer using [AWS Lambda Console](https:
 
 === "SAM"
 
-    ```yaml hl_lines="5"
-    MyLambdaFunction:
-        Type: AWS::Serverless::Function
-        Properties:
-            Layers:
-                - !Sub arn:aws:lambda:${AWS::Region}:017000801446:layer:AWSLambdaPowertoolsPython:13
+    ```yaml hl_lines="11"
+    --8<-- "docs/examples/index/lambda_layer_template.yml"
     ```
 
 === "Serverless framework"
@@ -78,13 +74,13 @@ You can include Lambda Powertools Lambda Layer using [AWS Lambda Console](https:
 === "CDK"
 
     ```python hl_lines="11 16"
-    --8<-- "docs/examples/cdk_app.py"
+    --8<-- "docs/examples/index/lambda_layer_cdk_app.py"
     ```
 
 === "Terraform"
 
     ```terraform hl_lines="9 35"
-    --8<-- "docs/examples/main.tf"
+    --8<-- "docs/examples/index/lambda_layer_main.tf"
     ```
 
 === "Amplify"
@@ -149,20 +145,8 @@ If using SAM, you can include this SAR App as part of your shared Layers stack,
 
 === "SAM"
 
-    ```yaml hl_lines="5-6 12-13"
-    AwsLambdaPowertoolsPythonLayer:
-        Type: AWS::Serverless::Application
-        Properties:
-            Location:
-                ApplicationId: arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer
-                SemanticVersion: 1.24.1 # change to latest semantic version available in SAR
-
-    MyLambdaFunction:
-        Type: AWS::Serverless::Function
-        Properties:
-            Layers:
-                # fetch Layer ARN from SAR App stack output
-                - !GetAtt AwsLambdaPowertoolsPythonLayer.Outputs.LayerVersionArn
+    ```yaml hl_lines="8-9 18-19"
+    --8<-- "docs/examples/index/sar_template.yml"
     ```
 
 === "Serverless framework"
@@ -183,21 +167,21 @@ If using SAM, you can include this SAR App as part of your shared Layers stack,
                 Location:
                     ApplicationId: arn:aws:serverlessrepo:eu-west-1:057560766410:applications/aws-lambda-powertools-python-layer
                     # Find latest from github.com/awslabs/aws-lambda-powertools-python/releases
-                    SemanticVersion: 1.24.1
+                    SemanticVersion: 1.25.3
     ```
 
 === "CDK"
 
-    ```python hl_lines="16 22-25 34"
-    --8<-- "docs/examples/sar_cdk_app.py"
+    ```python hl_lines="19 22-25 34"
+    --8<-- "docs/examples/index/sar_cdk_app.py"
     ```
 
 === "Terraform"
 
 	> Credits to [Dani Comnea](https://github.com/DanyC97) for providing the Terraform equivalent.
 
     ```terraform hl_lines="12-13 15-20 23-25 40"
-    --8<-- "docs/examples/sar_main.tf"
+    --8<-- "docs/examples/index/sar_main.tf"
     ```
 
 ??? example "Example: Least-privileged IAM permissions to deploy Layer"
@@ -209,7 +193,7 @@ If using SAM, you can include this SAR App as part of your shared Layers stack,
     === "template.yml"
 
         ```yaml hl_lines="21-52"
-        --8<-- "docs/examples/least_priviledged_template.yml"
+        --8<-- "docs/examples/index/least_priviledged_template.yml"
         ```
 
 You can fetch available versions via SAR ListApplicationVersions API: