cdk-patterns · cdk-patterns · Nov 22, 2020 · Nov 22, 2020 · Nov 22, 2020 · Nov 22, 2020
diff --git a/build-python.sh b/build-python.sh
@@ -1,16 +1,37 @@
+function getCDKVersion() {
+    version="1.60.0"
+
+    readarray -t requirements <<<"$(<requirements.txt)"
+     for requirement in "${requirements[@]}"
+       do
+          if [[ "$requirement" == aws-cdk.* ]]; then
+            IFS='==' read -a fields <<<"$requirement"
+            version=${fields[2]}
+            break;
+          fi
+       done
+
+    echo $version
+}
+
 readarray -t patterns < <(jq -r '.[] | keys | .[]' info.json);
 for pattern in "${patterns[@]}"
 do
    cd $pattern/python;
    if test -f "requirements.txt"; then
+     #we want to build with the version of cdk defined in requirements.txt
+     version=$(getCDKVersion)
      python3 -m venv .env;
      source .env/bin/activate;
      pip3 install -r requirements.txt;
-     readarray -t stacks < <(npx -q cdk ls);
+     readarray -t stacks < <(npx -q cdk@${version} ls)
+     if [[ "${#stacks[@]}" == 0 ]]; then
+       exit 1
+     fi
      for stack in "${stacks[@]}"
        do
           echo "npx cdk synth $stack";
-          npx cdk synth "$stack";
+          npx cdk@${version} synth "$stack";
        done    
      deactivate
    fi

diff --git a/polly/python/polly/polly_stack.py b/polly/python/polly/polly_stack.py
@@ -1,6 +1,7 @@
 from aws_cdk import (
     aws_lambda as _lambda,
     aws_apigatewayv2 as api_gw,
+    aws_apigatewayv2_integrations as integrations,
     aws_iam as iam,
     core
 )
@@ -27,6 +28,6 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
 
         # defines an API Gateway Http API resource backed by our "efs_lambda" function.
         api = api_gw.HttpApi(self, 'Polly',
-                             default_integration=api_gw.LambdaProxyIntegration(handler=polly_lambda))
+                             default_integration=integrations.LambdaProxyIntegration(handler=polly_lambda))
 
         core.CfnOutput(self, 'HTTP API Url', value=api.url)
diff --git a/polly/python/requirements.txt b/polly/python/requirements.txt
@@ -1,5 +1,7 @@
 -e .
-aws-cdk.core==1.60.0
-aws-cdk.aws-lambda==1.60.0
-aws-cdk.aws-apigatewayv2==1.60.0
-aws-cdk.aws-iam==1.60.0
+aws-cdk.core==1.74.0
+aws-cdk.aws-lambda==1.74.0
+aws-cdk.aws-apigatewayv2==1.74.0
+aws-cdk.aws-apigatewayv2-integrations==1.74.0
+aws-cdk.aws-iam==1.74.0
+
diff --git a/the-alexa-skill/python/img/arch.png b/the-alexa-skill/python/img/arch.png
diff --git a/the-alexa-skill/python/img/lwa-security-profile.png b/the-alexa-skill/python/img/lwa-security-profile.png
diff --git a/the-alexa-skill/python/img/postman-oauth-settings.png b/the-alexa-skill/python/img/postman-oauth-settings.png
diff --git a/the-alexa-skill/python/lambda_fns/lambda.js b/the-alexa-skill/python/lambda_fns/lambda.js
@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 var ask_sdk_core_1 = require("ask-sdk-core");
-var patterns = ['The Destined Lambda', 'The Dynamo Streamer', 'The Big Fan', 'The Cloudwatch Dashboard', 'The S3 Angular Website', 'This pattern that you\'re testing right now: The Alexa Skill'];
+var patterns = ['The Destined Lambda', 'The S3 React Website', 'The State Machine', 'The Dynamo Streamer', 'The Lambda Trilogy', 'The Big Fan', 'The Eventbridge Circuit Breaker', 'The Scalable Webhook', 'The Cloudwatch Dashboard', 'The Saga Stepfunction', 'The S3 Angular Website', 'this pattern that you\'re testing right now: The Alexa Skill'];
 var ddbAdapter = require('ask-sdk-dynamodb-persistence-adapter');
 var USERS_TABLE = process.env.USERS_TABLE || '';
 function getPattern(min, max) {
@@ -90,7 +90,7 @@ var PatternListIntentHandler = {
                         return [4 /*yield*/, attributesManager.savePersistentAttributes()];
                     case 1:
                         _a.sent();
-                        speechText = 'I have many patterns for you to see! For example, there is ' + patterns[getPattern(0, 1)] + ', ' + patterns[getPattern(2, 3)] + ' or ' + patterns[getPattern(4, 5)] + '!';
+                        speechText = 'I have many patterns for you to see! For example, there is ' + patterns[getPattern(0, 3)] + ', ' + patterns[getPattern(4, 7)] + ' or ' + patterns[getPattern(8, 11)] + '!';
                         return [2 /*return*/, handlerInput.responseBuilder
                                 .speak(speechText)
                                 .withSimpleCard('Hello World', speechText)

diff --git a/the-alexa-skill/python/requirements.txt b/the-alexa-skill/python/requirements.txt
@@ -1,7 +1,8 @@
 -e .
-aws-cdk.core==1.50.0
-aws-cdk.aws-lambda==1.50.0
-aws-cdk.aws-dynamodb==1.50.0
-aws-cdk.alexa-ask==1.50.0
-aws-cdk.aws-s3-assets==1.50.0
-aws-cdk.aws-iam==1.50.0
+aws-cdk.core==1.74.0
+aws-cdk.aws-lambda==1.74.0
+aws-cdk.aws-dynamodb==1.74.0
+aws-cdk.alexa-ask==1.74.0
+aws-cdk.aws-s3-assets==1.74.0
+aws-cdk.aws-iam==1.74.0
+
diff --git a/the-basic-mq/python/requirements.txt b/the-basic-mq/python/requirements.txt
@@ -1,11 +1,12 @@
 -e .
-aws-cdk.core==1.51.0
-aws-cdk.aws-route53==1.51.0
-aws-cdk.aws-route53-targets==1.51.0
-aws-cdk.aws-certificatemanager==1.51.0
-aws-cdk.aws-ec2==1.51.0
-aws-cdk.aws-ssm==1.51.0
-aws-cdk.aws-amazonmq==1.51.0
-aws-cdk.aws-elasticloadbalancingv2==1.51.0
-aws-cdk.aws-elasticloadbalancingv2-targets==1.51.0
-aws-cdk.custom-resources==1.51.0
+aws-cdk.core==1.74.0
+aws-cdk.aws-route53==1.74.0
+aws-cdk.aws-route53-targets==1.74.0
+aws-cdk.aws-certificatemanager==1.74.0
+aws-cdk.aws-ec2==1.74.0
+aws-cdk.aws-ssm==1.74.0
+aws-cdk.aws-amazonmq==1.74.0
+aws-cdk.aws-elasticloadbalancingv2==1.74.0
+aws-cdk.aws-elasticloadbalancingv2-targets==1.74.0
+aws-cdk.custom-resources==1.74.0
+
diff --git a/the-big-fan/python/requirements.txt b/the-big-fan/python/requirements.txt
@@ -1,9 +1,9 @@
 -e .
-aws-cdk.core==1.60.0
-aws-cdk.aws_apigateway==1.60.0
-aws-cdk.aws-lambda==1.60.0
-aws-cdk.aws-lambda-event-sources==1.60.0
-aws-cdk.aws-iam==1.60.0
-aws-cdk.aws-sns==1.60.0
-aws-cdk.aws-sns-subscriptions==1.60.0
-aws-cdk.aws-sqs==1.60.0
+aws-cdk.core==1.74.0
+aws-cdk.aws_apigateway==1.74.0
+aws-cdk.aws-lambda==1.74.0
+aws-cdk.aws-lambda-event-sources==1.74.0
+aws-cdk.aws-iam==1.74.0
+aws-cdk.aws-sns==1.74.0
+aws-cdk.aws-sns-subscriptions==1.74.0
+aws-cdk.aws-sqs==1.74.0
diff --git a/the-cloudwatch-dashboard/python/requirements.txt b/the-cloudwatch-dashboard/python/requirements.txt
@@ -1,8 +1,9 @@
 -e .
-aws-cdk.core==1.60.0
-aws-cdk.aws_apigatewayv2==1.60.0
-aws-cdk.aws-lambda==1.60.0
-aws-cdk.aws-dynamodb==1.60.0
-aws-cdk.aws-sns==1.60.0
-aws-cdk.aws-cloudwatch==1.60.0
-aws-cdk.aws-cloudwatch-actions==1.60.0
+aws-cdk.core==1.74.0
+aws-cdk.aws_apigatewayv2==1.74.0
+aws-cdk.aws-apigatewayv2-integrations==1.74.0
+aws-cdk.aws-lambda==1.74.0
+aws-cdk.aws-dynamodb==1.74.0
+aws-cdk.aws-sns==1.74.0
+aws-cdk.aws-cloudwatch==1.74.0
+aws-cdk.aws-cloudwatch-actions==1.74.0
diff --git a/the-cloudwatch-dashboard/python/the_cloudwatch_dashboard/the_cloudwatch_dashboard_stack.py b/the-cloudwatch-dashboard/python/the_cloudwatch_dashboard/the_cloudwatch_dashboard_stack.py
@@ -1,6 +1,7 @@
 from aws_cdk import (
     aws_lambda as _lambda,
     aws_apigatewayv2 as api_gw,
+    aws_apigatewayv2_integrations as integrations,
     aws_dynamodb as dynamo_db,
     aws_sns as sns,
     aws_cloudwatch as cloud_watch,
@@ -43,7 +44,7 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
 
         # defines an API Gateway Http API resource backed by our "dynamoLambda" function.
         api = api_gw.HttpApi(self, 'HttpAPI',
-                             default_integration=api_gw.LambdaProxyIntegration(handler=dynamo_lambda));
+                             default_integration=integrations.LambdaProxyIntegration(handler=dynamo_lambda));
 
         core.CfnOutput(self, 'HTTP API Url', value=api.url);
 
@@ -109,7 +110,7 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
                                                             label="DynamoDB Errors",
                                                             using_metrics={
                                                                 "m1": table.metric_user_errors(),
-                                                                "m2": table.metric_system_errors(),
+                                                                "m2": table.metric_system_errors_for_operations(),
                                                             },
                                                             period=core.Duration.minutes(5))
 

diff --git a/the-destined-lambda/python/requirements.txt b/the-destined-lambda/python/requirements.txt
@@ -1,10 +1,10 @@
 -e .
-aws-cdk.core==1.60.0
-aws-cdk.aws-lambda==1.60.0
-aws-cdk.aws-iam==1.60.0
-aws-cdk.aws-events==1.60.0
-aws-cdk.aws-events-targets==1.60.0
-aws-cdk.aws-sns==1.60.0
-aws-cdk.aws-sns-subscriptions==1.60.0
-aws-cdk.aws-lambda-destinations==1.60.0
-aws-cdk.aws_apigateway==1.60.0
+aws-cdk.core==1.74.0
+aws-cdk.aws-lambda==1.74.0
+aws-cdk.aws-iam==1.74.0
+aws-cdk.aws-events==1.74.0
+aws-cdk.aws-events-targets==1.74.0
+aws-cdk.aws-sns==1.74.0
+aws-cdk.aws-sns-subscriptions==1.74.0
+aws-cdk.aws-lambda-destinations==1.74.0
+aws-cdk.aws_apigateway==1.74.0
diff --git a/the-dynamo-streamer/python/requirements.txt b/the-dynamo-streamer/python/requirements.txt
@@ -1,7 +1,7 @@
 -e .
-aws-cdk.core==1.60.0
-aws-cdk.aws-dynamodb==1.60.0
-aws-cdk.aws_apigateway==1.60.0
-aws-cdk.aws-lambda==1.60.0
-aws-cdk.aws-lambda-event-sources==1.60.0
-aws-cdk.aws-iam==1.60.0
+aws-cdk.core==1.74.0
+aws-cdk.aws-dynamodb==1.74.0
+aws-cdk.aws_apigateway==1.74.0
+aws-cdk.aws-lambda==1.74.0
+aws-cdk.aws-lambda-event-sources==1.74.0
+aws-cdk.aws-iam==1.74.0
diff --git a/the-efs-lambda/python/requirements.txt b/the-efs-lambda/python/requirements.txt
@@ -1,6 +1,7 @@
 -e .
-aws-cdk.core==1.60.0
-aws-cdk.aws-apigatewayv2==1.60.0
-aws-cdk.aws-ec2==1.60.0
-aws-cdk.aws-lambda==1.60.0
-aws-cdk.aws-efs==1.60.0
+aws-cdk.core==1.74.0
+aws-cdk.aws-apigatewayv2==1.74.0
+aws-cdk.aws-apigatewayv2-integrations==1.74.0
+aws-cdk.aws-ec2==1.74.0
+aws-cdk.aws-lambda==1.74.0
+aws-cdk.aws-efs==1.74.0
diff --git a/the-efs-lambda/python/the_efs_lambda/the_efs_lambda_stack.py b/the-efs-lambda/python/the_efs_lambda/the_efs_lambda_stack.py
@@ -1,6 +1,7 @@
 from aws_cdk import (
     aws_lambda as _lambda,
     aws_apigatewayv2 as api_gw,
+    aws_apigatewayv2_integrations as integrations,
     aws_ec2 as ec2,
     aws_efs as efs,
     core
@@ -34,6 +35,6 @@ def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
 
         # defines an API Gateway Http API resource backed by our "efs_lambda" function.
         api = api_gw.HttpApi(self, 'EFS Lambda',
-                             default_integration=api_gw.LambdaProxyIntegration(handler=efs_lambda));
+                             default_integration=integrations.LambdaProxyIntegration(handler=efs_lambda));
 
         core.CfnOutput(self, 'HTTP API Url', value=api.url);
diff --git a/the-eventbridge-atm/python/requirements.txt b/the-eventbridge-atm/python/requirements.txt
@@ -1,8 +1,8 @@
 -e .
-aws-cdk.core==1.60.0
-aws-cdk.aws-iam==1.60.0
-aws-cdk.aws-lambda==1.60.0
-aws-cdk.aws-lambda-event-sources==1.60.0
-aws-cdk.aws-events-targets==1.60.0
-aws-cdk.aws-events==1.60.0
-aws-cdk.aws_apigateway==1.60.0
+aws-cdk.core==1.74.0
+aws-cdk.aws-iam==1.74.0
+aws-cdk.aws-lambda==1.74.0
+aws-cdk.aws-lambda-event-sources==1.74.0
+aws-cdk.aws-events-targets==1.74.0
+aws-cdk.aws-events==1.74.0
+aws-cdk.aws_apigateway==1.74.0
diff --git a/the-eventbridge-circuit-breaker/python/requirements.txt b/the-eventbridge-circuit-breaker/python/requirements.txt
@@ -1,8 +1,8 @@
 -e .
-aws-cdk.core==1.60.0
-aws-cdk.aws-iam==1.60.0
-aws-cdk.aws_apigateway==1.60.0
-aws-cdk.aws-lambda==1.60.0
-aws-cdk.aws-dynamodb==1.60.0
-aws-cdk.aws-events-targets==1.60.0
-aws-cdk.aws-events==1.60.0
+aws-cdk.core==1.74.0
+aws-cdk.aws-iam==1.74.0
+aws-cdk.aws_apigateway==1.74.0
+aws-cdk.aws-lambda==1.74.0
+aws-cdk.aws-dynamodb==1.74.0
+aws-cdk.aws-events-targets==1.74.0
+aws-cdk.aws-events==1.74.0
diff --git a/the-eventbridge-etl/python/requirements.txt b/the-eventbridge-etl/python/requirements.txt
@@ -1,14 +1,14 @@
 -e .
-aws-cdk.core==1.60.0
-aws-cdk.aws-lambda==1.60.0
-aws-cdk.aws-lambda-event-sources==1.60.0
-aws-cdk.aws-dynamodb==1.60.0
-aws-cdk.aws-s3==1.60.0
-aws-cdk.aws-sqs==1.60.0
-aws-cdk.aws-s3-notifications==1.60.0
-aws-cdk.aws-iam==1.60.0
-aws-cdk.aws-ec2==1.60.0
-aws-cdk.aws-ecs==1.60.0
-aws-cdk.aws-logs==1.60.0
-aws-cdk.aws-events==1.60.0
-aws-cdk.aws-events-targets==1.60.0
+aws-cdk.core==1.74.0
+aws-cdk.aws-lambda==1.74.0
+aws-cdk.aws-lambda-event-sources==1.74.0
+aws-cdk.aws-dynamodb==1.74.0
+aws-cdk.aws-s3==1.74.0
+aws-cdk.aws-sqs==1.74.0
+aws-cdk.aws-s3-notifications==1.74.0
+aws-cdk.aws-iam==1.74.0
+aws-cdk.aws-ec2==1.74.0
+aws-cdk.aws-ecs==1.74.0
+aws-cdk.aws-logs==1.74.0
+aws-cdk.aws-events==1.74.0
+aws-cdk.aws-events-targets==1.74.0