Update to version v1.91.0

awslabs · Mar 18, 2021 · 8cf66c6 · 8cf66c6
1 parent 52f29a1
commit 8cf66c6
Show file tree

Hide file tree

Showing 68 changed files with 416 additions and 181 deletions.
diff --git a/.viperlightignore b/.viperlightignore
@@ -14,7 +14,7 @@ source/patterns/@aws-solutions-constructs/core/test/step-function-helper.test.ts
 source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/test.kinesisstream-gluejob.test.ts:126
 source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.expected.json:112
 source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.expected.json:112
-source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.expected.json:193
+source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.expected.json:197
 source/tools/cdk-integ-tools/package-lock.json:373
 source/patterns/@aws-solutions-constructs/core/test/step-function-helper.test.js:115
 source/patterns/@aws-solutions-constructs/core/test/lambda-helper.test.ts:297

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## 1.91.0 (2021-03-14)
+
+### Changed
+- Upgraded all patterns to CDK v1.91.0
+
 ## 1.90.1 (2021-03-05)
 
 ### Changed

diff --git a/source/lerna.json b/source/lerna.json
@@ -6,5 +6,5 @@
     "./patterns/@aws-solutions-constructs/*"
   ],
   "rejectCycles": "true",
-  "version": "1.90.1"
+  "version": "1.91.0"
 }
diff --git a/...s/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.deployFunction.expected.json b/...s/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.deployFunction.expected.json
@@ -131,19 +131,19 @@
             ]
           }
         },
-        "Handler": "index.handler",
         "Role": {
           "Fn::GetAtt": [
             "testapigatewaylambdaLambdaFunctionServiceRole5CD2E9F7",
             "Arn"
           ]
         },
-        "Runtime": "nodejs10.x",
         "Environment": {
           "Variables": {
             "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1"
           }
         },
+        "Handler": "index.handler",
+        "Runtime": "nodejs10.x",
         "TracingConfig": {
           "Mode": "Active"
         }

diff --git a/...@aws-solutions-constructs/aws-apigateway-lambda/test/integ.existingFunction.expected.json b/...@aws-solutions-constructs/aws-apigateway-lambda/test/integ.existingFunction.expected.json
@@ -131,19 +131,19 @@
             ]
           }
         },
-        "Handler": "index.handler",
         "Role": {
           "Fn::GetAtt": [
             "LambdaFunctionServiceRole0C4CDE0B",
             "Arn"
           ]
         },
-        "Runtime": "nodejs10.x",
         "Environment": {
           "Variables": {
             "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1"
           }
         },
+        "Handler": "index.handler",
+        "Runtime": "nodejs10.x",
         "TracingConfig": {
           "Mode": "Active"
         }

diff --git a/...ws-solutions-constructs/aws-apigateway-sqs/test/__snapshots__/apigateway-sqs.test.js.snap b/...ws-solutions-constructs/aws-apigateway-sqs/test/__snapshots__/apigateway-sqs.test.js.snap
@@ -536,10 +536,12 @@ Object {
       "Type": "AWS::IAM::Policy",
     },
     "apigatewaysqsdeadLetterQueue25B510FA": Object {
+      "DeletionPolicy": "Delete",
       "Properties": Object {
         "KmsMasterKeyId": "alias/aws/sqs",
       },
       "Type": "AWS::SQS::Queue",
+      "UpdateReplacePolicy": "Delete",
     },
     "apigatewaysqsdeadLetterQueuePolicy55247071": Object {
       "Properties": Object {
@@ -611,6 +613,7 @@ Object {
       "Type": "AWS::SQS::QueuePolicy",
     },
     "apigatewaysqsqueueE186B895": Object {
+      "DeletionPolicy": "Delete",
       "Properties": Object {
         "KmsMasterKeyId": "alias/aws/sqs",
         "RedrivePolicy": Object {
@@ -624,6 +627,7 @@ Object {
         },
       },
       "Type": "AWS::SQS::Queue",
+      "UpdateReplacePolicy": "Delete",
     },
     "apigatewaysqsqueuePolicy2A16DE42": Object {
       "Properties": Object {
@@ -1045,10 +1049,12 @@ Object {
       "Type": "AWS::IAM::Policy",
     },
     "apigatewaysqsdeadLetterQueue25B510FA": Object {
+      "DeletionPolicy": "Delete",
       "Properties": Object {
         "KmsMasterKeyId": "alias/aws/sqs",
       },
       "Type": "AWS::SQS::Queue",
+      "UpdateReplacePolicy": "Delete",
     },
     "apigatewaysqsdeadLetterQueuePolicy55247071": Object {
       "Properties": Object {
@@ -1120,6 +1126,7 @@ Object {
       "Type": "AWS::SQS::QueuePolicy",
     },
     "apigatewaysqsqueueE186B895": Object {
+      "DeletionPolicy": "Delete",
       "Properties": Object {
         "KmsMasterKeyId": "alias/aws/sqs",
         "RedrivePolicy": Object {
@@ -1133,6 +1140,7 @@ Object {
         },
       },
       "Type": "AWS::SQS::Queue",
+      "UpdateReplacePolicy": "Delete",
     },
     "apigatewaysqsqueuePolicy2A16DE42": Object {
       "Properties": Object {
@@ -1554,10 +1562,12 @@ Object {
       "Type": "AWS::IAM::Policy",
     },
     "apigatewaysqsqueueE186B895": Object {
+      "DeletionPolicy": "Delete",
       "Properties": Object {
         "KmsMasterKeyId": "alias/aws/sqs",
       },
       "Type": "AWS::SQS::Queue",
+      "UpdateReplacePolicy": "Delete",
     },
     "apigatewaysqsqueuePolicy2A16DE42": Object {
       "Properties": Object {
@@ -1979,10 +1989,12 @@ Object {
       "Type": "AWS::IAM::Policy",
     },
     "apigatewaysqsdeadLetterQueue25B510FA": Object {
+      "DeletionPolicy": "Delete",
       "Properties": Object {
         "KmsMasterKeyId": "alias/aws/sqs",
       },
       "Type": "AWS::SQS::Queue",
+      "UpdateReplacePolicy": "Delete",
     },
     "apigatewaysqsdeadLetterQueuePolicy55247071": Object {
       "Properties": Object {
@@ -2054,6 +2066,7 @@ Object {
       "Type": "AWS::SQS::QueuePolicy",
     },
     "apigatewaysqsqueueE186B895": Object {
+      "DeletionPolicy": "Delete",
       "Properties": Object {
         "KmsMasterKeyId": "alias/aws/sqs",
         "RedrivePolicy": Object {
@@ -2067,6 +2080,7 @@ Object {
         },
       },
       "Type": "AWS::SQS::Queue",
+      "UpdateReplacePolicy": "Delete",
     },
     "apigatewaysqsqueuePolicy2A16DE42": Object {
       "Properties": Object {
@@ -2488,10 +2502,12 @@ Object {
       "Type": "AWS::IAM::Policy",
     },
     "apigatewaysqsdeadLetterQueue25B510FA": Object {
+      "DeletionPolicy": "Delete",
       "Properties": Object {
         "KmsMasterKeyId": "alias/aws/sqs",
       },
       "Type": "AWS::SQS::Queue",
+      "UpdateReplacePolicy": "Delete",
     },
     "apigatewaysqsdeadLetterQueuePolicy55247071": Object {
       "Properties": Object {
@@ -2563,6 +2579,7 @@ Object {
       "Type": "AWS::SQS::QueuePolicy",
     },
     "apigatewaysqsqueueE186B895": Object {
+      "DeletionPolicy": "Delete",
       "Properties": Object {
         "KmsMasterKeyId": "alias/aws/sqs",
         "RedrivePolicy": Object {
@@ -2576,6 +2593,7 @@ Object {
         },
       },
       "Type": "AWS::SQS::Queue",
+      "UpdateReplacePolicy": "Delete",
     },
     "apigatewaysqsqueuePolicy2A16DE42": Object {
       "Properties": Object {

diff --git a/...@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.expected.json b/...@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.expected.json
@@ -5,7 +5,9 @@
       "Type": "AWS::SQS::Queue",
       "Properties": {
         "KmsMasterKeyId": "alias/aws/sqs"
-      }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete"
     },
     "testapigatewaysqsdeadLetterQueuePolicy3CC9D87F": {
       "Type": "AWS::SQS::QueuePolicy",
@@ -89,7 +91,9 @@
           },
           "maxReceiveCount": 15
         }
-      }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete"
     },
     "testapigatewaysqsqueuePolicy8623EDE8": {
       "Type": "AWS::SQS::QueuePolicy",

diff --git a/...tterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.no-arguments.expected.json b/...tterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.no-arguments.expected.json
@@ -5,7 +5,9 @@
       "Type": "AWS::SQS::Queue",
       "Properties": {
         "KmsMasterKeyId": "alias/aws/sqs"
-      }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete"
     },
     "testapigatewaysqsdefaultdeadLetterQueuePolicyEF507332": {
       "Type": "AWS::SQS::QueuePolicy",
@@ -89,7 +91,9 @@
           },
           "maxReceiveCount": 15
         }
-      }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete"
     },
     "testapigatewaysqsdefaultqueuePolicy529DEC31": {
       "Type": "AWS::SQS::QueuePolicy",

diff --git a/...lutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.no-arguments.expected.json b/...lutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.no-arguments.expected.json
@@ -131,19 +131,19 @@
             ]
           }
         },
-        "Handler": "index.handler",
         "Role": {
           "Fn::GetAtt": [
             "testcloudfrontapigatewaylambdaLambdaFunctionServiceRoleCB74590F",
             "Arn"
           ]
         },
-        "Runtime": "nodejs10.x",
         "Environment": {
           "Variables": {
             "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1"
           }
         },
+        "Handler": "index.handler",
+        "Runtime": "nodejs10.x",
         "TracingConfig": {
           "Mode": "Active"
         }
@@ -712,13 +712,13 @@
         "Code": {
           "ZipFile": "exports.handler = (event, context, callback) => {           const response = event.Records[0].cf.response;           const headers = response.headers;           headers['x-xss-protection'] = [             {               key: 'X-XSS-Protection',               value: '1; mode=block'             }           ];           headers['x-frame-options'] = [             {               key: 'X-Frame-Options',               value: 'DENY'             }           ];           headers['x-content-type-options'] = [             {               key: 'X-Content-Type-Options',               value: 'nosniff'             }           ];           headers['strict-transport-security'] = [             {               key: 'Strict-Transport-Security',               value: 'max-age=63072000; includeSubdomains; preload'             }           ];           headers['referrer-policy'] = [             {               key: 'Referrer-Policy',               value: 'same-origin'             }           ];           headers['content-security-policy'] = [             {               key: 'Content-Security-Policy',               value: \"default-src 'none'; base-uri 'self'; img-src 'self'; script-src 'self'; style-src 'self' https:; object-src 'none'; frame-ancestors 'none'; font-src 'self' https:; form-action 'self'; manifest-src 'self'; connect-src 'self'\"              }           ];           callback(null, response);         };"
         },
-        "Handler": "index.handler",
         "Role": {
           "Fn::GetAtt": [
             "testcloudfrontapigatewaylambdaCloudFrontToApiGatewaySetHttpSecurityHeadersServiceRoleCA39BFFF",
             "Arn"
           ]
         },
+        "Handler": "index.handler",
         "Runtime": "nodejs12.x",
         "TracingConfig": {
           "Mode": "Active"

diff --git a/...@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.expected.json b/...@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.expected.json
@@ -131,19 +131,19 @@
             ]
           }
         },
-        "Handler": "index.handler",
         "Role": {
           "Fn::GetAtt": [
             "LambdaFunctionServiceRole0C4CDE0B",
             "Arn"
           ]
         },
-        "Runtime": "nodejs10.x",
         "Environment": {
           "Variables": {
             "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1"
           }
         },
+        "Handler": "index.handler",
+        "Runtime": "nodejs10.x",
         "TracingConfig": {
           "Mode": "Active"
         }
@@ -712,13 +712,13 @@
         "Code": {
           "ZipFile": "exports.handler = (event, context, callback) => {           const response = event.Records[0].cf.response;           const headers = response.headers;           headers['x-xss-protection'] = [             {               key: 'X-XSS-Protection',               value: '1; mode=block'             }           ];           headers['x-frame-options'] = [             {               key: 'X-Frame-Options',               value: 'DENY'             }           ];           headers['x-content-type-options'] = [             {               key: 'X-Content-Type-Options',               value: 'nosniff'             }           ];           headers['strict-transport-security'] = [             {               key: 'Strict-Transport-Security',               value: 'max-age=63072000; includeSubdomains; preload'             }           ];           headers['referrer-policy'] = [             {               key: 'Referrer-Policy',               value: 'same-origin'             }           ];           headers['content-security-policy'] = [             {               key: 'Content-Security-Policy',               value: \"default-src 'none'; base-uri 'self'; img-src 'self'; script-src 'self'; style-src 'self' https:; object-src 'none'; frame-ancestors 'none'; font-src 'self' https:; form-action 'self'; manifest-src 'self'; connect-src 'self'\"              }           ];           callback(null, response);         };"
         },
-        "Handler": "index.handler",
         "Role": {
           "Fn::GetAtt": [
             "testcloudfrontapigatewaySetHttpSecurityHeadersServiceRole20BDDF39",
             "Arn"
           ]
         },
+        "Handler": "index.handler",
         "Runtime": "nodejs12.x",
         "TracingConfig": {
           "Mode": "Active"

diff --git a/...erns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.default.expected.json b/...erns/@aws-solutions-constructs/aws-cloudfront-mediastore/test/integ.default.expected.json
@@ -184,13 +184,13 @@
         "Code": {
           "ZipFile": "exports.handler = (event, context, callback) => {           const response = event.Records[0].cf.response;           const headers = response.headers;           headers['x-xss-protection'] = [             {               key: 'X-XSS-Protection',               value: '1; mode=block'             }           ];           headers['x-frame-options'] = [             {               key: 'X-Frame-Options',               value: 'DENY'             }           ];           headers['x-content-type-options'] = [             {               key: 'X-Content-Type-Options',               value: 'nosniff'             }           ];           headers['strict-transport-security'] = [             {               key: 'Strict-Transport-Security',               value: 'max-age=63072000; includeSubdomains; preload'             }           ];           headers['referrer-policy'] = [             {               key: 'Referrer-Policy',               value: 'same-origin'             }           ];           headers['content-security-policy'] = [             {               key: 'Content-Security-Policy',               value: \"default-src 'none'; base-uri 'self'; img-src 'self'; script-src 'self'; style-src 'self' https:; object-src 'none'; frame-ancestors 'none'; font-src 'self' https:; form-action 'self'; manifest-src 'self'; connect-src 'self'\"              }           ];           callback(null, response);         };"
         },
-        "Handler": "index.handler",
         "Role": {
           "Fn::GetAtt": [
             "testcloudfrontmediastoreSetHttpSecurityHeadersServiceRole2F1F5449",
             "Arn"
           ]
         },
+        "Handler": "index.handler",
         "Runtime": "nodejs12.x",
         "TracingConfig": {
           "Mode": "Active"

diff --git a/...-cognito-apigateway-lambda/test/__snapshots__/test.cognito-apigateway-lambda.test.js.snap b/...-cognito-apigateway-lambda/test/__snapshots__/test.cognito-apigateway-lambda.test.js.snap
@@ -110,6 +110,7 @@ Object {
       "Type": "AWS::Cognito::UserPoolClient",
     },
     "testcognitoapigatewaylambdaCognitoUserPoolD5E74489": Object {
+      "DeletionPolicy": "Retain",
       "Properties": Object {
         "AccountRecoverySetting": Object {
           "RecoveryMechanisms": Array [
@@ -140,6 +141,7 @@ Object {
         },
       },
       "Type": "AWS::Cognito::UserPool",
+      "UpdateReplacePolicy": "Retain",
     },
     "testcognitoapigatewaylambdaLambdaFunction0C8EAC23": Object {
       "DependsOn": Array [

diff --git a/...-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.no-arguments.expected.json b/...-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.no-arguments.expected.json
@@ -130,19 +130,19 @@
             ]
           }
         },
-        "Handler": "index.handler",
         "Role": {
           "Fn::GetAtt": [
             "testcognitoapigatewaylambdaLambdaFunctionServiceRole943D8510",
             "Arn"
           ]
         },
-        "Runtime": "nodejs12.x",
         "Environment": {
           "Variables": {
             "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1"
           }
         },
+        "Handler": "index.handler",
+        "Runtime": "nodejs12.x",
         "TracingConfig": {
           "Mode": "Active"
         }
@@ -625,7 +625,9 @@
           "EmailSubject": "Verify your new account",
           "SmsMessage": "The verification code to your new account is {####}"
         }
-      }
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain"
     },
     "testcognitoapigatewaylambdaCognitoUserPoolClientDA118627": {
       "Type": "AWS::Cognito::UserPoolClient",