diff --git a/CHANGELOG.md b/CHANGELOG.md index f745d3fc3..5ba1c8f5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.67.0] - 2020-10-09 + +### Changed +- Upgraded all patterns to CDK v1.66.0 +- Make CloudWatch alarm creation optional ([#85](https://github.com/awslabs/aws-solutions-constructs/issues/85)) + ## [1.66.0] - 2020-10-06 ### Added diff --git a/NOTICE.txt b/NOTICE.txt index 60c18149b..bac0bccec 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ AWS Solutions Constructs -Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance with the License. A copy of the License is located at http://www.apache.org/licenses/ or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, diff --git a/README.md b/README.md index ca4a8d8c0..1823af54d 100644 --- a/README.md +++ b/README.md @@ -46,4 +46,4 @@ This library includes a collection of functional use case implementations to dem * Use case pattern: https://github.com/awslabs/aws-solutions-constructs/tree/master/source/use_cases/aws-serverless-web-app *** -© Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file +© Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file diff --git a/source/lerna.json b/source/lerna.json index 26643b108..ed3cb1322 100644 --- a/source/lerna.json +++ b/source/lerna.json @@ -6,5 +6,5 @@ "./patterns/@aws-solutions-constructs/*" ], "rejectCycles": "true", - "version": "1.66.0" + "version": "1.67.0" } diff --git a/source/package.json b/source/package.json index 1946280ef..1f41e4a19 100644 --- a/source/package.json +++ b/source/package.json @@ -1,6 +1,6 @@ { "name": "aws-solutions-constructs", - "version": "1.66.0", + "version": "1.67.0", "description": "AWS Solutions Constructs Library", "repository": { "type": "git", diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/lib/index.ts index dfcf5d2b2..1fbb5ba49 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/package.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/package.json index d54a62ebc..d6905d0c3 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-apigateway-dynamodb", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for AWS API Gateway and Amazon DynamoDB integration.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,16 +53,16 @@ } }, "dependencies": { - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-dynamodb": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-dynamodb": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -72,12 +72,12 @@ ] }, "peerDependencies": { - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-dynamodb": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-dynamodb": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-logs": "~1.66.0" + "@aws-cdk/aws-logs": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/apigateway-dynamodb.test.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/apigateway-dynamodb.test.ts index 5fe9cfe18..0df171b1d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/apigateway-dynamodb.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/apigateway-dynamodb.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-CRUD.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-CRUD.ts index 15442846c..3ed061504 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-CRUD.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-CRUD.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.no-arguments.ts index db6b9c799..e320b3d76 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/lib/index.ts index a54b560b5..66812e0fe 100755 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/package.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/package.json index 9ecd96316..2f783e3aa 100755 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-apigateway-iot", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK constructs to proxy communication to IotCore using a APIGateway(REST).", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,15 +53,15 @@ } }, "dependencies": { - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -71,11 +71,11 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-iam": "~1.66.0" + "@aws-cdk/aws-iam": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.defaultParams.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.defaultParams.ts index 2893ab394..914216712 100755 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.defaultParams.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.defaultParams.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.overrideParams.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.overrideParams.ts index a5ebc7c85..b681ad3d2 100755 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.overrideParams.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.overrideParams.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.override_auth_api_keys.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.override_auth_api_keys.ts index 4f207679a..e3f0206f0 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.override_auth_api_keys.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.override_auth_api_keys.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/test.apigateway-iot.test.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/test.apigateway-iot.test.ts index 710831661..162f577cc 100755 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/test.apigateway-iot.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/test.apigateway-iot.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/lib/index.ts index 3978cad29..408d35aab 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/package.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/package.json index 2536a43a0..15fcda7fd 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-apigateway-kinesisstreams", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for AWS API Gateway and Amazon Kinesis Data Streams integration.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,16 +53,16 @@ } }, "dependencies": { - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-kinesis": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-kinesis": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -72,12 +72,12 @@ ] }, "peerDependencies": { - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-kinesis": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-kinesis": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-logs": "~1.66.0" + "@aws-cdk/aws-logs": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/apigateway-kinesis.test.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/apigateway-kinesis.test.ts index 3ee8b4fa6..1745ed731 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/apigateway-kinesis.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/apigateway-kinesis.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apigateway-kinesis-overwrite.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apigateway-kinesis-overwrite.ts index 3921dc824..e139db07c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apigateway-kinesis-overwrite.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.apigateway-kinesis-overwrite.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.no-arguments.ts index d77b21b69..0769da844 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/lib/index.ts index 690f89808..f598ecdce 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/package.json index 07f841f80..fceae933c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-apigateway-lambda", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK constructs for defining an interaction between an API Gateway and a Lambda function.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,16 +53,16 @@ } }, "dependencies": { - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -72,12 +72,12 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-iam": "~1.66.0" + "@aws-cdk/aws-iam": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.deployFunction.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.deployFunction.ts index 83587f3f3..5f4cd75fe 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.deployFunction.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.deployFunction.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.existingFunction.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.existingFunction.ts index faa026371..15fe30a51 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.existingFunction.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.existingFunction.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/test.apigateway-lambda.test.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/test.apigateway-lambda.test.ts index ff9ce6774..872a3f678 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/test.apigateway-lambda.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/test.apigateway-lambda.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at @@ -191,4 +191,32 @@ test('Test deployment ApiGateway AuthorizationType override', () => { HttpMethod: "ANY", AuthorizationType: "NONE" }); - }); \ No newline at end of file +}); + +// ----------------------------------------------------------------- +// Test deployment for override ApiGateway cloudWatchRole = false +// ----------------------------------------------------------------- +test('Test deployment ApiGateway override cloudWatchRole = false', () => { + // Stack + const stack = new Stack(); + // Helper declaration + new ApiGatewayToLambda(stack, 'api-gateway-lambda', { + apiGatewayProps: { + cloudWatchRole: false + }, + lambdaFunctionProps: { + runtime: lambda.Runtime.NODEJS_10_X, + handler: 'index.handler', + code: lambda.Code.fromAsset(`${__dirname}/lambda`) + } + }); + // Assertion 1 + expect(stack).toHaveResourceLike("AWS::ApiGateway::Account", { + CloudWatchRoleArn: { + "Fn::GetAtt": [ + "apigatewaylambdaLambdaRestApiCloudWatchRoleA759E8AC", + "Arn" + ] + } + }); +}); \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/lib/index.ts index 5e3000797..63dc8ea27 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/package.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/package.json index cf3729cd8..d3502115c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-apigateway-sqs", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK constructs for defining an interaction between an AWS Lambda function and an Amazon S3 bucket.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,17 +53,17 @@ } }, "dependencies": { - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -73,13 +73,13 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-logs": "~1.66.0" + "@aws-cdk/aws-logs": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/apigateway-sqs.test.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/apigateway-sqs.test.ts index 6f986c723..e17f9ddb9 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/apigateway-sqs.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/apigateway-sqs.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.ts index d3c291adc..88b361513 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.no-arguments.ts index 5ce7ecdd1..4557fa33e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/lib/index.ts index c61fa1202..7932abee6 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/package.json index b8b5bc7ba..36bbcdd9e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-cloudfront-apigateway-lambda", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for AWS Cloudfront to AWS API Gateway to AWS Lambda integration.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,19 +53,19 @@ } }, "dependencies": { - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-cloudfront": "~1.66.0", - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-solutions-constructs/aws-cloudfront-apigateway": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-cloudfront": "~1.67.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-solutions-constructs/aws-cloudfront-apigateway": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -75,15 +75,15 @@ ] }, "peerDependencies": { - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-cloudfront": "~1.66.0", - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-solutions-constructs/aws-cloudfront-apigateway": "~1.66.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-cloudfront": "~1.67.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-solutions-constructs/aws-cloudfront-apigateway": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0" + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.no-arguments.ts index 931bda889..cc2cd6cc8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/test.cloudfront-apigateway-lambda.test.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/test.cloudfront-apigateway-lambda.test.ts index 43dde04f4..d37dfef66 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/test.cloudfront-apigateway-lambda.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/test.cloudfront-apigateway-lambda.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/lib/index.ts index 5e972122d..0ddd74310 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/package.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/package.json index 3dd265002..c64867ad2 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-cloudfront-apigateway", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for AWS Cloudfront to AWS API Gateway integration.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,17 +53,17 @@ } }, "dependencies": { - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-cloudfront": "~1.66.0", - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-cloudfront": "~1.67.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -73,13 +73,13 @@ ] }, "peerDependencies": { - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-cloudfront": "~1.66.0", - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-cloudfront": "~1.67.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-s3": "~1.66.0" + "@aws-cdk/aws-s3": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/__snapshots__/test.cloudfront-apigateway.test.js.snap b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/__snapshots__/test.cloudfront-apigateway.test.js.snap index cd4ce5529..e5c764e37 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/__snapshots__/test.cloudfront-apigateway.test.js.snap +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/__snapshots__/test.cloudfront-apigateway.test.js.snap @@ -31,16 +31,16 @@ Object { }, }, "Parameters": Object { - "AssetParametersd33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818ArtifactHashAC93FA3A": Object { - "Description": "Artifact hash for asset \\"d33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818\\"", + "AssetParameters76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2ArtifactHash86D9D5EA": Object { + "Description": "Artifact hash for asset \\"76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2\\"", "Type": "String", }, - "AssetParametersd33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818S3BucketC8A24561": Object { - "Description": "S3 bucket for asset \\"d33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818\\"", + "AssetParameters76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2S3BucketD637F5E2": Object { + "Description": "S3 bucket for asset \\"76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2\\"", "Type": "String", }, - "AssetParametersd33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818S3VersionKey130FEE10": Object { - "Description": "S3 key for asset version \\"d33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818\\"", + "AssetParameters76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2S3VersionKeyEAFC3492": Object { + "Description": "S3 key for asset version \\"76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2\\"", "Type": "String", }, }, @@ -68,7 +68,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParametersd33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818S3BucketC8A24561", + "Ref": "AssetParameters76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2S3BucketD637F5E2", }, "S3Key": Object { "Fn::Join": Array [ @@ -81,7 +81,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersd33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818S3VersionKey130FEE10", + "Ref": "AssetParameters76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2S3VersionKeyEAFC3492", }, ], }, @@ -94,7 +94,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersd33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818S3VersionKey130FEE10", + "Ref": "AssetParameters76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2S3VersionKeyEAFC3492", }, ], }, diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.expected.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.expected.json index c3f47e445..1eadc8db8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.expected.json @@ -95,7 +95,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParametersd33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818S3BucketC8A24561" + "Ref": "AssetParameters76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2S3BucketD637F5E2" }, "S3Key": { "Fn::Join": [ @@ -108,7 +108,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersd33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818S3VersionKey130FEE10" + "Ref": "AssetParameters76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2S3VersionKeyEAFC3492" } ] } @@ -121,7 +121,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersd33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818S3VersionKey130FEE10" + "Ref": "AssetParameters76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2S3VersionKeyEAFC3492" } ] } @@ -939,17 +939,17 @@ } }, "Parameters": { - "AssetParametersd33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818S3BucketC8A24561": { + "AssetParameters76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2S3BucketD637F5E2": { "Type": "String", - "Description": "S3 bucket for asset \"d33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818\"" + "Description": "S3 bucket for asset \"76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2\"" }, - "AssetParametersd33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818S3VersionKey130FEE10": { + "AssetParameters76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2S3VersionKeyEAFC3492": { "Type": "String", - "Description": "S3 key for asset version \"d33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818\"" + "Description": "S3 key for asset version \"76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2\"" }, - "AssetParametersd33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818ArtifactHashAC93FA3A": { + "AssetParameters76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2ArtifactHash86D9D5EA": { "Type": "String", - "Description": "Artifact hash for asset \"d33617a1ef21b93e3004e105c4a9f7b7161a4fb02955f6a28508a80e3c8dc818\"" + "Description": "Artifact hash for asset \"76457685de34c4b8447dc527f32d442291b2efeb05bcfcba793036ac6c94d9a2\"" } }, "Outputs": { diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.ts index 07d4e54fc..83a73e32f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/lambda/index.js b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/lambda/index.js index f8b706418..7b4ea39cc 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/lambda/index.js +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/lambda/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/test.cloudfront-apigateway.test.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/test.cloudfront-apigateway.test.ts index f4ab1e682..b6fcfa5e8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/test.cloudfront-apigateway.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/test.cloudfront-apigateway.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/README.md b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/README.md index b78c4e8ad..066e12ed6 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/README.md +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/README.md @@ -85,4 +85,4 @@ Out of the box implementation of the Construct without any override will set the ![Architecture Diagram](architecture.png) *** -© Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file +© Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/lib/index.ts index 4c07b05dd..1d3775d37 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/package.json b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/package.json index a7219908d..8d62037c5 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-cloudfront-s3", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for AWS Cloudfront to AWS S3 integration.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,15 +53,15 @@ } }, "dependencies": { - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-cloudfront": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-cloudfront": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -71,11 +71,11 @@ ] }, "peerDependencies": { - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-cloudfront": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-cloudfront": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-lambda": "~1.66.0" + "@aws-cdk/aws-lambda": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.existing-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.existing-bucket.ts index 7be550cf1..79d9a443e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.existing-bucket.ts +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.existing-bucket.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-arguments.ts index 1b38799f8..2d28f4c9c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-security-headers.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-security-headers.ts index 9d9348536..42b025760 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-security-headers.ts +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.no-security-headers.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/test.cloudfront-s3.test.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/test.cloudfront-s3.test.ts index 7acc94743..e21f6a04f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/test.cloudfront-s3.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/test.cloudfront-s3.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/lib/index.ts index f53c18fff..5ee67ee68 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/package.json index ee227ede8..743ac7fab 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-cognito-apigateway-lambda", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for AWS Cognito to AWS API Gateway to AWS Lambda integration", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,17 +53,17 @@ } }, "dependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-cognito": "~1.66.0", - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-cognito": "~1.67.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -73,13 +73,13 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-cognito": "~1.66.0", - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-cognito": "~1.67.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0" + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.no-arguments.ts index 69f7a64a3..6fcdf74b3 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/test.cognito-apigateway-lambda.test.ts b/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/test.cognito-apigateway-lambda.test.ts index c72027015..077e8bb2f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/test.cognito-apigateway-lambda.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/test/test.cognito-apigateway-lambda.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/README.md b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/README.md index 6ff8c8e15..ab535b7d6 100644 --- a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/README.md +++ b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/README.md @@ -67,6 +67,7 @@ _Parameters_ |dynamoEventSourceProps?|[`aws-lambda-event-sources.DynamoEventSourceProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda-event-sources.DynamoEventSourceProps.html)|Optional user provided props to override the default props for DynamoDB Event Source| |esDomainProps?|[`elasticsearch.CfnDomainProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-elasticsearch.CfnDomainProps.html)|Optional user provided props to override the default props for the Elasticsearch Service| |domainName|`string`|Domain name for the Cognito and the Elasticsearch Service| +|createCloudWatchAlarms|`boolean`|Whether to create recommended CloudWatch alarms| ## Pattern Properties @@ -79,7 +80,7 @@ _Parameters_ |identityPool|[`cognito.CfnIdentityPool`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cognito.CfnIdentityPool.html)|Returns an instance of cognito.CfnIdentityPool created by the construct| |elasticsearchDomain|[`elasticsearch.CfnDomain`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-elasticsearch.CfnDomain.html)|Returns an instance of elasticsearch.CfnDomain created by the construct| |elasticsearchDomain|[`iam.Role`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-iam.Role.html)|Returns an instance of iam.Role created by the construct for elasticsearch.CfnDomain| -|cloudwatchAlarms|[`cloudwatch.Alarm[]`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudwatch.Alarm.html)|Returns a list of cloudwatch.Alarm created by the construct| +|cloudwatchAlarms?|[`cloudwatch.Alarm[]`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudwatch.Alarm.html)|Returns a list of cloudwatch.Alarm created by the construct| ## Lambda Function diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/lib/index.ts index d802b978a..ebbcb43b3 100644 --- a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at @@ -87,7 +87,13 @@ export interface DynamoDBStreamToLambdaToElasticSearchAndKibanaProps { * * @default - Default props are used */ - readonly sqsDlqQueueProps?: sqs.QueueProps + readonly sqsDlqQueueProps?: sqs.QueueProps, + /** + * Whether to create recommended CloudWatch alarms + * + * @default - Alarms are created + */ + readonly createCloudWatchAlarms?: boolean } export class DynamoDBStreamToLambdaToElasticSearchAndKibana extends Construct { @@ -100,7 +106,7 @@ export class DynamoDBStreamToLambdaToElasticSearchAndKibana extends Construct { public readonly identityPool: cognito.CfnIdentityPool; public readonly elasticsearchDomain: elasticsearch.CfnDomain; public readonly elasticsearchRole: iam.Role; - public readonly cloudwatchAlarms: cloudwatch.Alarm[]; + public readonly cloudwatchAlarms?: cloudwatch.Alarm[]; /** * @summary Constructs a new instance of the LambdaToDynamoDB class. @@ -131,7 +137,8 @@ export class DynamoDBStreamToLambdaToElasticSearchAndKibana extends Construct { existingLambdaObj: this.lambdaFunction, domainName: props.domainName, esDomainProps: props.esDomainProps, - cognitoDomainName: props.cognitoDomainName + cognitoDomainName: props.cognitoDomainName, + createCloudWatchAlarms: props.createCloudWatchAlarms }; this.lambdaToElasticSearchAndKibana = new LambdaToElasticSearchAndKibana(this, 'LambdaToElasticSearch', _props2); diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/package.json b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/package.json index 14557c505..1944a920c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for Amazon Dynamodb stream to AWS Lambda to AWS Elasticsearch with Kibana integration", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,22 +53,22 @@ } }, "dependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-lambda-event-sources": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-cognito": "~1.66.0", - "@aws-cdk/aws-elasticsearch": "~1.66.0", - "@aws-cdk/aws-dynamodb": "~1.66.0", - "@aws-cdk/aws-cloudwatch": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-solutions-constructs/aws-dynamodb-stream-lambda": "~1.66.0", - "@aws-solutions-constructs/aws-lambda-elasticsearch-kibana": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-lambda-event-sources": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-cognito": "~1.67.0", + "@aws-cdk/aws-elasticsearch": "~1.67.0", + "@aws-cdk/aws-dynamodb": "~1.67.0", + "@aws-cdk/aws-cloudwatch": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-solutions-constructs/aws-dynamodb-stream-lambda": "~1.67.0", + "@aws-solutions-constructs/aws-lambda-elasticsearch-kibana": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -78,18 +78,18 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-cognito": "~1.66.0", - "@aws-cdk/aws-elasticsearch": "~1.66.0", - "@aws-cdk/aws-dynamodb": "~1.66.0", - "@aws-cdk/aws-cloudwatch": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-solutions-constructs/aws-dynamodb-stream-lambda": "~1.66.0", - "@aws-solutions-constructs/aws-lambda-elasticsearch-kibana": "~1.66.0", - "@aws-cdk/aws-lambda-event-sources": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-cognito": "~1.67.0", + "@aws-cdk/aws-elasticsearch": "~1.67.0", + "@aws-cdk/aws-dynamodb": "~1.67.0", + "@aws-cdk/aws-cloudwatch": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-solutions-constructs/aws-dynamodb-stream-lambda": "~1.67.0", + "@aws-solutions-constructs/aws-lambda-elasticsearch-kibana": "~1.67.0", + "@aws-cdk/aws-lambda-event-sources": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0" + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/test/dynamodb-stream-lambda-elasticsearch-kibana.test.ts b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/test/dynamodb-stream-lambda-elasticsearch-kibana.test.ts index 1c4cd9b64..67d685de8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/test/dynamodb-stream-lambda-elasticsearch-kibana.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/test/dynamodb-stream-lambda-elasticsearch-kibana.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/test/integ.no-arguments.ts index 5857c8332..44e477b0b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/lib/index.ts index a95ff5a31..998616fb8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/package.json index b7f8c4773..b823619e5 100644 --- a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-dynamodb-stream-lambda", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for AWS DynamoDB Stream to AWS Lambda integration.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,17 +53,17 @@ } }, "dependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-lambda-event-sources": "~1.66.0", - "@aws-cdk/aws-dynamodb": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-lambda-event-sources": "~1.67.0", + "@aws-cdk/aws-dynamodb": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -73,13 +73,13 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-dynamodb": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-cdk/aws-lambda-event-sources": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-dynamodb": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-cdk/aws-lambda-event-sources": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0" + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/test/dynamodb-stream-lambda.test.ts b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/test/dynamodb-stream-lambda.test.ts index ef996d001..3a092315a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/test/dynamodb-stream-lambda.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/test/dynamodb-stream-lambda.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/test/integ.no-arguments.ts index c7c776c13..a7d6a2e86 100644 --- a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/lib/index.ts index 036e3d341..c83a8a1ad 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/package.json index 13006d6da..ea8e4279a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-events-rule-lambda", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for deploying AWS Events Rule that inveokes AWS Lambda", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,15 +53,15 @@ } }, "dependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-events": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-events": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -71,11 +71,11 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-events": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-events": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/test/events-rule-lambda.test.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/test/events-rule-lambda.test.ts index 0679fc9d0..4be9e5f0e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/test/events-rule-lambda.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/test/events-rule-lambda.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/test/integ.events-rule-no-argument.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/test/integ.events-rule-no-argument.ts index c696b0378..2449bea35 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/test/integ.events-rule-no-argument.ts +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/test/integ.events-rule-no-argument.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/lib/index.ts index 15f64edb4..eed17e600 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/package.json b/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/package.json index c3429b9b6..853c14d47 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-events-rule-sns", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for deploying AWS Events Rule that invokes AWS SNS", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,16 +53,16 @@ } }, "dependencies": { - "@aws-cdk/aws-events": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-sns": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-events": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-sns": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -72,12 +72,12 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-sns": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-events": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-sns": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-events": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/test/events-rule-sns-topic.test.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/test/events-rule-sns-topic.test.ts index a5300b6c2..30b8fc94d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/test/events-rule-sns-topic.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/test/events-rule-sns-topic.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/test/integ.events-rule-no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/test/integ.events-rule-no-arguments.ts index 39ae92dde..6e9b9c3b6 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/test/integ.events-rule-no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/test/integ.events-rule-no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/lib/index.ts index 337a09b5a..3c9766d09 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/package.json b/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/package.json index 47c5e8bdc..f2cd41d4d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-events-rule-sqs", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for deploying AWS Events Rule that invokes AWS SQS", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,16 +53,16 @@ } }, "dependencies": { - "@aws-cdk/aws-events": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-events": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -72,12 +72,12 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-events": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-events": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/test/events-rule-sqs-queue.test.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/test/events-rule-sqs-queue.test.ts index af7a2084b..f387695fc 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/test/events-rule-sqs-queue.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/test/events-rule-sqs-queue.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/test/integ.events-rule-existing-queue.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/test/integ.events-rule-existing-queue.ts index e18a83199..8bb9c9cf4 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/test/integ.events-rule-existing-queue.ts +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/test/integ.events-rule-existing-queue.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/test/integ.events-rule-no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/test/integ.events-rule-no-arguments.ts index 0c43785d5..8f929caa3 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/test/integ.events-rule-no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/test/integ.events-rule-no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/README.md b/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/README.md index 32c310661..e5f5fc3fa 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/README.md +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/README.md @@ -61,6 +61,7 @@ _Parameters_ |:-------------|:----------------|-----------------| |stateMachineProps|[`sfn.StateMachineProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-stepfunctions.StateMachineProps.html)|Optional user provided props to override the default props for sfn.StateMachine| |eventRuleProps|[`events.RuleProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-events.RuleProps.html)|User provided eventRuleProps to override the defaults| +|createCloudWatchAlarms|`boolean`|Whether to create recommended CloudWatch alarms| ## Pattern Properties @@ -69,7 +70,7 @@ _Parameters_ |eventsRule|[`events.Rule`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-events.Rule.html)|Returns an instance of events.Rule created by the construct| |stateMachine|[`sfn.StateMachine`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-stepfunctions.StateMachine.html)|Returns an instance of sfn.StateMachine created by the construct| |stateMachineLogGroup|[`logs.LogGroup`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-logs.LogGroup.html)|Returns an instance of the LogGroup created by the construct for StateMachine| -|cloudwatchAlarms|[`cloudwatch.Alarm[]`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudwatch.Alarm.html)|Returns a list of cloudwatch.Alarm created by the construct| +|cloudwatchAlarms?|[`cloudwatch.Alarm[]`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudwatch.Alarm.html)|Returns a list of cloudwatch.Alarm created by the construct| ## Default settings diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/lib/index.ts index 2d0addd67..bf324724a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at @@ -35,14 +35,20 @@ export interface EventsRuleToStepFunctionProps { * * @default - None */ - readonly eventRuleProps: events.RuleProps + readonly eventRuleProps: events.RuleProps, + /** + * Whether to create recommended CloudWatch alarms + * + * @default - Alarms are created + */ + readonly createCloudWatchAlarms?: boolean } export class EventsRuleToStepFunction extends Construct { public readonly stateMachine: sfn.StateMachine; public readonly stateMachineLogGroup: LogGroup; public readonly eventsRule: events.Rule; - public readonly cloudwatchAlarms: cloudwatch.Alarm[]; + public readonly cloudwatchAlarms?: cloudwatch.Alarm[]; /** * @summary Constructs a new instance of the EventsRuleToStepFunction class. @@ -80,7 +86,10 @@ export class EventsRuleToStepFunction extends Construct { const eventsRuleProps = overrideProps(defaultEventsRuleProps, props.eventRuleProps, true); // Create the Events Rule for the State Machine this.eventsRule = new events.Rule(this, 'EventsRule', eventsRuleProps); - // Deploy best practices CW Alarms for State Machine - this.cloudwatchAlarms = defaults.buildStepFunctionCWAlarms(this, this.stateMachine); + + if (props.createCloudWatchAlarms === undefined || props.createCloudWatchAlarms) { + // Deploy best practices CW Alarms for State Machine + this.cloudwatchAlarms = defaults.buildStepFunctionCWAlarms(this, this.stateMachine); + } } } \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/package.json b/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/package.json index ea1dc5d6b..96626d4c8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-events-rule-step-function", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for deploying AWS Events Rule that invokes AWS Step Function", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,19 +53,19 @@ } }, "dependencies": { - "@aws-cdk/aws-stepfunctions": "~1.66.0", - "@aws-cdk/aws-stepfunctions-tasks": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-events": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-cdk/aws-cloudwatch": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-stepfunctions": "~1.67.0", + "@aws-cdk/aws-stepfunctions-tasks": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-events": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-cdk/aws-cloudwatch": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -75,15 +75,15 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-stepfunctions": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-events": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-stepfunctions": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-events": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-cloudwatch": "~1.66.0", - "@aws-cdk/aws-stepfunctions-tasks": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0" + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-cloudwatch": "~1.67.0", + "@aws-cdk/aws-stepfunctions-tasks": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/test/events-rule-step-function.test.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/test/events-rule-step-function.test.ts index a2f03f61f..4feae782c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/test/events-rule-step-function.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/test/events-rule-step-function.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at @@ -96,4 +96,26 @@ test('check properties', () => { expect(construct.stateMachine !== null); expect(construct.eventsRule !== null); expect(construct.stateMachineLogGroup !== null); +}); + +test('check properties with no CW Alarms', () => { + const stack = new cdk.Stack(); + const startState = new sfn.Pass(stack, 'StartState'); + + const props: EventsRuleToStepFunctionProps = { + stateMachineProps: { + definition: startState + }, + eventRuleProps: { + schedule: events.Schedule.rate(Duration.minutes(5)) + }, + createCloudWatchAlarms: false + }; + + const construct: EventsRuleToStepFunction = new EventsRuleToStepFunction(stack, 'test-events-rule-step-function', props); + + expect(construct.cloudwatchAlarms === null); + expect(construct.stateMachine !== null); + expect(construct.eventsRule !== null); + expect(construct.stateMachineLogGroup !== null); }); \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/test/integ.events-rule-step-function-no-argument.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/test/integ.events-rule-step-function-no-argument.ts index a18709e40..e781daf1a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/test/integ.events-rule-step-function-no-argument.ts +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/test/integ.events-rule-step-function-no-argument.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/test/integ.events-rule-step-function-with-lambda.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/test/integ.events-rule-step-function-with-lambda.ts index b9fd40dba..59f0f7752 100644 --- a/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/test/integ.events-rule-step-function-with-lambda.ts +++ b/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/test/integ.events-rule-step-function-with-lambda.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/lib/index.ts index a1584b21b..c1a8bfd5c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/package.json b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/package.json index d3af7d018..fc30f888e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-iot-kinesisfirehose-s3", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for AWS IoT to AWS Kinesis Firehose to AWS S3 integration.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,18 +53,18 @@ } }, "dependencies": { - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-kinesisfirehose": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-iot": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-solutions-constructs/aws-kinesisfirehose-s3": "~1.66.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-kinesisfirehose": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-iot": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-solutions-constructs/aws-kinesisfirehose-s3": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -74,14 +74,14 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-kinesisfirehose": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-iot": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-solutions-constructs/aws-kinesisfirehose-s3": "~1.66.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-kinesisfirehose": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-iot": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-solutions-constructs/aws-kinesisfirehose-s3": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-logs": "~1.66.0" + "@aws-cdk/aws-logs": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.no-arguments.ts index 0e35ba314..aacaadfe8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/test.iot-kinesisfirehose-s3.test.ts b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/test.iot-kinesisfirehose-s3.test.ts index 1f3644f4e..d7d9c2953 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/test.iot-kinesisfirehose-s3.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/test/test.iot-kinesisfirehose-s3.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/lib/index.ts index f7dfa141c..22f63cc86 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/package.json b/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/package.json index d6d64bb51..4dcd1e563 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-iot-lambda-dynamodb", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for AWS IoT to AWS Lambda to AWS DyanmoDB integration.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,17 +53,17 @@ } }, "dependencies": { - "@aws-cdk/aws-dynamodb": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-iot": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-solutions-constructs/aws-iot-lambda": "~1.66.0", - "@aws-solutions-constructs/aws-lambda-dynamodb": "~1.66.0", + "@aws-cdk/aws-dynamodb": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-iot": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-solutions-constructs/aws-iot-lambda": "~1.67.0", + "@aws-solutions-constructs/aws-lambda-dynamodb": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -73,13 +73,13 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-dynamodb": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-iot": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-solutions-constructs/aws-iot-lambda": "~1.66.0", - "@aws-solutions-constructs/aws-lambda-dynamodb": "~1.66.0", + "@aws-cdk/aws-dynamodb": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-iot": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-solutions-constructs/aws-iot-lambda": "~1.67.0", + "@aws-solutions-constructs/aws-lambda-dynamodb": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iot-lambda-dynamodb.ts b/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iot-lambda-dynamodb.ts index 4d7ed95fb..2c36123fc 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iot-lambda-dynamodb.ts +++ b/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/integ.iot-lambda-dynamodb.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/iot-lambda-dynamodb.test.ts b/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/iot-lambda-dynamodb.test.ts index 2551b61f6..22d10e2b7 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/iot-lambda-dynamodb.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/iot-lambda-dynamodb.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/lib/index.ts index 569a68b66..b6b171245 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/package.json index d164b6a0d..c9cb58525 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-iot-lambda", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for AWS IoT to AWS Lambda integration", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,15 +53,15 @@ } }, "dependencies": { - "@aws-cdk/aws-iot": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-iot": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -71,11 +71,11 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-iot": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", + "@aws-cdk/aws-iot": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-new-func.ts b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-new-func.ts index 1e66b98d2..a3c02319a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-new-func.ts +++ b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-new-func.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-use-existing-func.ts b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-use-existing-func.ts index fabd7d170..f40fb37a3 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-use-existing-func.ts +++ b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/integ.iot-lambda-use-existing-func.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/iot-lambda.test.ts b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/iot-lambda.test.ts index 34406adf2..85bf98e98 100644 --- a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/iot-lambda.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/test/iot-lambda.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/lib/index.ts index 6691e027f..893169b9c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/package.json b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/package.json index cbb3a41f3..b035d840a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK constructs for defining an interaction between an Amazon Kinesis Data Firehose delivery stream and (1) an Amazon S3 bucket, and (2) an Amazon Kinesis Data Analytics application.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,19 +53,19 @@ } }, "dependencies": { - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-kinesis": "~1.66.0", - "@aws-cdk/aws-kinesisanalytics": "~1.66.0", - "@aws-cdk/aws-kinesisfirehose": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-solutions-constructs/aws-kinesisfirehose-s3": "~1.66.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-kinesis": "~1.67.0", + "@aws-cdk/aws-kinesisanalytics": "~1.67.0", + "@aws-cdk/aws-kinesisfirehose": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-solutions-constructs/aws-kinesisfirehose-s3": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -75,15 +75,15 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-kinesis": "~1.66.0", - "@aws-cdk/aws-kinesisanalytics": "~1.66.0", - "@aws-cdk/aws-kinesisfirehose": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-solutions-constructs/aws-kinesisfirehose-s3": "~1.66.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-kinesis": "~1.67.0", + "@aws-cdk/aws-kinesisanalytics": "~1.67.0", + "@aws-cdk/aws-kinesisfirehose": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-solutions-constructs/aws-kinesisfirehose-s3": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-logs": "~1.66.0" + "@aws-cdk/aws-logs": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.no-arguments.ts index ac3cd1476..71a7d4ac4 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/test.kinesisfirehose-analytics-s3.test.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/test.kinesisfirehose-analytics-s3.test.ts index 94a287f06..4cb8cf592 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/test.kinesisfirehose-analytics-s3.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/test/test.kinesisfirehose-analytics-s3.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/lib/index.ts index 0faf0a0db..17ae0afb3 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/package.json b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/package.json index 0f70e35d3..fe37ff8a5 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-kinesisfirehose-s3", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK constructs for defining an interaction between an Amazon Kinesis Data Firehose delivery stream and an Amazon S3 bucket.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,16 +53,16 @@ } }, "dependencies": { - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-kinesisfirehose": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-kinesisfirehose": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -72,12 +72,12 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-kinesisfirehose": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-kinesisfirehose": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.no-arguments.ts index 62158133e..01a4165ed 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-bucket.ts index 25ed5254c..931584ca8 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-bucket.ts +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/integ.pre-existing-bucket.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/test.kinesisfirehose-s3.test.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/test.kinesisfirehose-s3.test.ts index 6ec9bc74f..4572d7912 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/test.kinesisfirehose-s3.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/test/test.kinesisfirehose-s3.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/README.md b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/README.md index 94be75155..1c8861e8f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/README.md +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/README.md @@ -64,6 +64,7 @@ _Parameters_ |kinesisStreamProps?|[`kinesis.StreamProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-kinesis.StreamProps.html)|Optional user-provided props to override the default props for the Kinesis stream.| |existingStreamObj?|[`kinesis.Stream`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-kinesis.Stream.html)|Existing instance of Kinesis Stream, if this is set then kinesisStreamProps is ignored.| |kinesisEventSourceProps?|[`aws-lambda-event-sources.KinesisEventSourceProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda-event-sources.KinesisEventSourceProps.html)|Optional user-provided props to override the default props for the Lambda event source mapping.| +|createCloudWatchAlarms|`boolean`|Whether to create recommended CloudWatch alarms| ## Pattern Properties @@ -72,6 +73,7 @@ _Parameters_ |kinesisStream|[`kinesis.Stream`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-kinesis.Stream.html)|Returns an instance of the Kinesis stream created by the pattern.| |lambdaFunction|[`lambda.Function`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.Function.html)|Returns an instance of the Lambda function created by the pattern.| |kinesisStreamRole|[`iam.Role`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-iam.Role.html)|Returns an instance of the iam.Role created by the construct for Kinesis stream.| +|cloudwatchAlarms?|[`cloudwatch.Alarm[]`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudwatch.Alarm.html)|Returns a list of cloudwatch.Alarm created by the construct| ## Default settings diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/lib/index.ts index 396540ec1..a8e839570 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at @@ -67,6 +67,12 @@ export interface KinesisStreamsToLambdaProps { * @default - Default props are used */ readonly sqsDlqQueueProps?: sqs.QueueProps + /** + * Whether to create recommended CloudWatch alarms + * + * @default - Alarms are created + */ + readonly createCloudWatchAlarms?: boolean } /** @@ -75,7 +81,7 @@ export interface KinesisStreamsToLambdaProps { export class KinesisStreamsToLambda extends Construct { public readonly kinesisStream: kinesis.Stream; public readonly lambdaFunction: lambda.Function; - public readonly cloudwatchAlarms: cloudwatch.Alarm[]; + public readonly cloudwatchAlarms?: cloudwatch.Alarm[]; /** * @summary Constructs a new instance of the KinesisStreamsToLambda class. @@ -111,7 +117,9 @@ export class KinesisStreamsToLambda extends Construct { }); this.lambdaFunction.addEventSource(new KinesisEventSource(this.kinesisStream, eventSourceProps)); - // Deploy best practices CW Alarms for Kinesis Stream - this.cloudwatchAlarms = defaults.buildKinesisStreamCWAlarms(this); + if (props.createCloudWatchAlarms === undefined || props.createCloudWatchAlarms) { + // Deploy best practices CW Alarms for Kinesis Stream + this.cloudwatchAlarms = defaults.buildKinesisStreamCWAlarms(this); + } } } \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/package.json index a458c77c7..2f09543cf 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-kinesisstreams-lambda", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK constructs for defining an interaction between an Amazon Kinesis Data Stream and an AWS Lambda function.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,19 +53,19 @@ } }, "dependencies": { - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-kinesis": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/aws-lambda-event-sources": "~1.66.0", - "@aws-cdk/aws-cloudwatch": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-kinesis": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/aws-lambda-event-sources": "~1.67.0", + "@aws-cdk/aws-cloudwatch": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -75,15 +75,15 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-kinesis": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-lambda-event-sources": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-kinesis": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-lambda-event-sources": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/aws-cloudwatch": "~1.66.0" + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/aws-cloudwatch": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.existing.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.existing.ts index 37863bf87..cd4126617 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.existing.ts +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.existing.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.no-arguments.ts index c2f180ad4..db74d2acf 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/test.kinesisstreams-lambda.test.ts b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/test.kinesisstreams-lambda.test.ts index abe1be27f..58d892092 100644 --- a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/test.kinesisstreams-lambda.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/test.kinesisstreams-lambda.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at @@ -38,7 +38,7 @@ test('Pattern minimal deployment', () => { }); // -------------------------------------------------------------- -// Test getter methods +// Test properties // -------------------------------------------------------------- test('Test properties', () => { // Initial Setup @@ -48,10 +48,6 @@ test('Test properties', () => { runtime: lambda.Runtime.NODEJS_10_X, handler: 'index.handler', code: lambda.Code.fromAsset(`${__dirname}/lambda`) - }, - kinesisEventSourceProps: { - startingPosition: lambda.StartingPosition.TRIM_HORIZON, - batchSize: 1 } }; const app = new KinesisStreamsToLambda(stack, 'test-kinesis-streams-lambda', props); @@ -59,6 +55,8 @@ test('Test properties', () => { expect(app.lambdaFunction !== null); // Assertion 2 expect(app.kinesisStream !== null); + // Assertion 3 + expect(app.cloudwatchAlarms !== null); }); // -------------------------------------------------------------- @@ -113,6 +111,9 @@ test('Test existing resources', () => { }); }); +// -------------------------------------------------------------- +// Test sqsDlqQueueProps override +// -------------------------------------------------------------- test('test sqsDlqQueueProps override', () => { const stack = new Stack(); const props: KinesisStreamsToLambdaProps = { @@ -132,4 +133,27 @@ test('test sqsDlqQueueProps override', () => { QueueName: "hello-world", VisibilityTimeout: 50 }); - }); \ No newline at end of file + }); + +// -------------------------------------------------------------- +// Test properties with no CW Alarms +// -------------------------------------------------------------- +test('Test properties with no CW Alarms', () => { + // Initial Setup + const stack = new Stack(); + const props: KinesisStreamsToLambdaProps = { + lambdaFunctionProps: { + runtime: lambda.Runtime.NODEJS_10_X, + handler: 'index.handler', + code: lambda.Code.fromAsset(`${__dirname}/lambda`) + }, + createCloudWatchAlarms: false + }; + const app = new KinesisStreamsToLambda(stack, 'test-kinesis-streams-lambda', props); + // Assertion 1 + expect(app.lambdaFunction !== null); + // Assertion 2 + expect(app.kinesisStream !== null); + // Assertion 3 + expect(app.cloudwatchAlarms === null); +}); \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/lib/index.ts index e0d35c60c..cbf02f88d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/package.json b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/package.json index d57882123..4f6fd39f1 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-lambda-dynamodb", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for AWS Lambda to AWS DynamoDB integration.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,14 +53,14 @@ } }, "dependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-dynamodb": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-dynamodb": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -70,10 +70,10 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-dynamodb": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-dynamodb": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.add-secondary-index.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.add-secondary-index.ts index c67afd475..ec9a2eec3 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.add-secondary-index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.add-secondary-index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.no-arguments.ts index b9cec3a83..201310a36 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.set-billing-mode.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.set-billing-mode.ts index 33ba7d5ae..898cbc04a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.set-billing-mode.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.set-billing-mode.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.use-existing-func.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.use-existing-func.ts index bd676c1d2..785a58ca5 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.use-existing-func.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/integ.use-existing-func.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/lambda-dynamodb.test.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/lambda-dynamodb.test.ts index 7f270b6a8..b75d12000 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/lambda-dynamodb.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/lambda-dynamodb.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/README.md b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/README.md index 2b201d2cc..68d2b196b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/README.md +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/README.md @@ -66,6 +66,7 @@ _Parameters_ |esDomainProps?|[`elasticsearch.CfnDomainProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-elasticsearch.CfnDomainProps.html)|Optional user provided props to override the default props for the Elasticsearch Service| |domainName|`string`|Domain name for the Cognito and the Elasticsearch Service| |cognitoDomainName?|`string`|Optional Cognito Domain Name, if provided it will be used for Cognito Domain, and domainName will be used for the Elasticsearch Domain| +|createCloudWatchAlarms|`boolean`|Whether to create recommended CloudWatch alarms| ## Pattern Properties @@ -77,7 +78,7 @@ _Parameters_ |identityPool|[`cognito.CfnIdentityPool`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cognito.CfnIdentityPool.html)|Returns an instance of cognito.CfnIdentityPool created by the construct| |elasticsearchDomain|[`elasticsearch.CfnDomain`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-elasticsearch.CfnDomain.html)|Returns an instance of elasticsearch.CfnDomain created by the construct| |elasticsearchDomain|[`iam.Role`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-iam.Role.html)|Returns an instance of iam.Role created by the construct for elasticsearch.CfnDomain| -|cloudwatchAlarms|[`cloudwatch.Alarm[]`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudwatch.Alarm.html)|Returns a list of cloudwatch.Alarm created by the construct| +|cloudwatchAlarms?|[`cloudwatch.Alarm[]`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudwatch.Alarm.html)|Returns a list of cloudwatch.Alarm created by the construct| ## Lambda Function diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/lib/index.ts index 3029ec556..d27eee0b1 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at @@ -53,7 +53,13 @@ export interface LambdaToElasticSearchAndKibanaProps { * * @default - None */ - readonly cognitoDomainName?: string + readonly cognitoDomainName?: string, + /** + * Whether to create recommended CloudWatch alarms + * + * @default - Alarms are created + */ + readonly createCloudWatchAlarms?: boolean } export class LambdaToElasticSearchAndKibana extends Construct { @@ -63,7 +69,7 @@ export class LambdaToElasticSearchAndKibana extends Construct { public readonly elasticsearchDomain: elasticsearch.CfnDomain; public readonly elasticsearchRole: iam.Role; public readonly lambdaFunction: lambda.Function; - public readonly cloudwatchAlarms: cloudwatch.Alarm[]; + public readonly cloudwatchAlarms?: cloudwatch.Alarm[]; /** * @summary Constructs a new instance of the CognitoToApiGatewayToLambda class. @@ -109,7 +115,9 @@ export class LambdaToElasticSearchAndKibana extends Construct { // Add ES Domain to lambda envrionment variable this.lambdaFunction.addEnvironment('DOMAIN_ENDPOINT', this.elasticsearchDomain.attrDomainEndpoint); - // Deploy best practices CW Alarms for ES - this.cloudwatchAlarms = defaults.buildElasticSearchCWAlarms(this); + if (props.createCloudWatchAlarms === undefined || props.createCloudWatchAlarms) { + // Deploy best practices CW Alarms for ES + this.cloudwatchAlarms = defaults.buildElasticSearchCWAlarms(this); + } } } diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/package.json b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/package.json index 90c6fbfb0..52cf42e44 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-lambda-elasticsearch-kibana", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for AWS Lambda to AWS Elasticsearch with Kibana integration", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,17 +53,17 @@ } }, "dependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-cognito": "~1.66.0", - "@aws-cdk/aws-elasticsearch": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-cloudwatch": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-cognito": "~1.67.0", + "@aws-cdk/aws-elasticsearch": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-cloudwatch": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -73,13 +73,13 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-cognito": "~1.66.0", - "@aws-cdk/aws-elasticsearch": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-cloudwatch": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-cognito": "~1.67.0", + "@aws-cdk/aws-elasticsearch": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-cloudwatch": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.domain-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.domain-arguments.ts index d947baeb8..8bacfd7b7 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.domain-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.domain-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.no-arguments.ts index 0b9baf1dd..93d055920 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/lambda-elasticsearch-kibana.test.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/lambda-elasticsearch-kibana.test.ts index bd31bdc8b..30e3911ea 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/lambda-elasticsearch-kibana.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/lambda-elasticsearch-kibana.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at @@ -80,4 +80,28 @@ test('check exception for Missing existingObj from props for deploy = false', () } catch (e) { expect(e).toBeInstanceOf(Error); } +}); + +test('check properties with no CW Alarms ', () => { + const stack = new cdk.Stack(); + + const props: LambdaToElasticSearchAndKibanaProps = { + lambdaFunctionProps: { + code: lambda.Code.fromAsset(`${__dirname}/lambda`), + runtime: lambda.Runtime.NODEJS_10_X, + handler: 'index.handler' + }, + domainName: 'test-domain', + createCloudWatchAlarms: false + }; + + const construct = new LambdaToElasticSearchAndKibana(stack, 'test-lambda-elasticsearch-stack', props); + + expect(construct.lambdaFunction !== null); + expect(construct.elasticsearchDomain !== null); + expect(construct.identityPool !== null); + expect(construct.userPool !== null); + expect(construct.userPoolClient !== null); + expect(construct.cloudwatchAlarms === null); + expect(construct.elasticsearchRole !== null); }); \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/lib/index.ts index 9d3ee2be8..e59a0ace7 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/package.json b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/package.json index 7183848b6..b09bff3ca 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-lambda-s3", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK constructs for defining an interaction between an AWS Lambda function and an Amazon S3 bucket.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,14 +53,14 @@ } }, "dependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -70,10 +70,10 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunction.ts index 29ff96c19..3160abd88 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunction.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.deployFunction.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.existingFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.existingFunction.ts index fec52ffb3..e9c733547 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.existingFunction.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.existingFunction.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.pre-existing-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.pre-existing-bucket.ts index 4ee820dcf..f9cf10a63 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.pre-existing-bucket.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/integ.pre-existing-bucket.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/lambda-s3.test.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/lambda-s3.test.ts index 0ddd8ff46..9ccbddaf0 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/lambda-s3.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-s3/test/lambda-s3.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/lib/index.ts index 2b3faf162..6775d77c1 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/package.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/package.json index 6dd7056a6..0a3bcbebe 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-lambda-sns", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK constructs for defining an interaction between an AWS Lambda function and an Amazon SNS topic.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,15 +53,15 @@ } }, "dependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-sns": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-sns": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -71,11 +71,11 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-sns": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-sns": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunction.ts index dcc4cf972..1ce430082 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunction.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.deployFunction.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.existingFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.existingFunction.ts index b378e8c1a..d29623d1d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.existingFunction.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/integ.existingFunction.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/lambda-sns.test.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/lambda-sns.test.ts index be98c72b2..2527c3caf 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/lambda-sns.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sns/test/lambda-sns.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/lib/index.ts index ed7327f9a..cd7358cb0 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/package.json index 7dfebdd4a..5645c350e 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-lambda-sqs-lambda", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK construct that provisions (1) an AWS Lambda function that is configured to send messages to a queue; (2) an Amazon SQS queue; and (3) an AWS Lambda function configured to consume messages from the queue.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,16 +53,16 @@ } }, "dependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-solutions-constructs/aws-lambda-sqs": "~1.66.0", - "@aws-solutions-constructs/aws-sqs-lambda": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-solutions-constructs/aws-lambda-sqs": "~1.67.0", + "@aws-solutions-constructs/aws-sqs-lambda": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -72,12 +72,12 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-solutions-constructs/aws-lambda-sqs": "~1.66.0", - "@aws-solutions-constructs/aws-sqs-lambda": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-solutions-constructs/aws-lambda-sqs": "~1.67.0", + "@aws-solutions-constructs/aws-sqs-lambda": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/__snapshots__/lambda-sqs-lambda.test.js.snap b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/__snapshots__/lambda-sqs-lambda.test.js.snap index 112d56d73..728ea269c 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/__snapshots__/lambda-sqs-lambda.test.js.snap +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/__snapshots__/lambda-sqs-lambda.test.js.snap @@ -3,28 +3,28 @@ exports[`Test deployment w/ DLQ explicitly disabled 1`] = ` Object { "Parameters": Object { - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384ArtifactHashE6BDEF1E": Object { - "Description": "Artifact hash for asset \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5ArtifactHash6AF67D2F": Object { + "Description": "Artifact hash for asset \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3": Object { - "Description": "S3 bucket for asset \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45": Object { + "Description": "S3 bucket for asset \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502": Object { - "Description": "S3 key for asset version \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA": Object { + "Description": "S3 key for asset version \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fArtifactHashBC656546": Object { - "Description": "Artifact hash for asset \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aArtifactHash8AC382E7": Object { + "Description": "Artifact hash for asset \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B": Object { - "Description": "S3 bucket for asset \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629": Object { + "Description": "S3 bucket for asset \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9": Object { - "Description": "S3 key for asset version \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F": Object { + "Description": "S3 key for asset version \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, }, @@ -47,7 +47,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629", }, "S3Key": Object { "Fn::Join": Array [ @@ -60,7 +60,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F", }, ], }, @@ -73,7 +73,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F", }, ], }, @@ -301,7 +301,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45", }, "S3Key": Object { "Fn::Join": Array [ @@ -314,7 +314,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA", }, ], }, @@ -327,7 +327,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA", }, ], }, @@ -482,28 +482,28 @@ Object { exports[`Test deployment w/ DLQ explicitly enabled and w/ MRC override 1`] = ` Object { "Parameters": Object { - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384ArtifactHashE6BDEF1E": Object { - "Description": "Artifact hash for asset \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5ArtifactHash6AF67D2F": Object { + "Description": "Artifact hash for asset \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3": Object { - "Description": "S3 bucket for asset \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45": Object { + "Description": "S3 bucket for asset \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502": Object { - "Description": "S3 key for asset version \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA": Object { + "Description": "S3 key for asset version \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fArtifactHashBC656546": Object { - "Description": "Artifact hash for asset \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aArtifactHash8AC382E7": Object { + "Description": "Artifact hash for asset \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B": Object { - "Description": "S3 bucket for asset \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629": Object { + "Description": "S3 bucket for asset \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9": Object { - "Description": "S3 key for asset version \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F": Object { + "Description": "S3 key for asset version \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, }, @@ -526,7 +526,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629", }, "S3Key": Object { "Fn::Join": Array [ @@ -539,7 +539,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F", }, ], }, @@ -552,7 +552,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F", }, ], }, @@ -864,7 +864,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45", }, "S3Key": Object { "Fn::Join": Array [ @@ -877,7 +877,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA", }, ], }, @@ -890,7 +890,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA", }, ], }, @@ -1045,28 +1045,28 @@ Object { exports[`Test deployment w/ existing consumer function 1`] = ` Object { "Parameters": Object { - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384ArtifactHashE6BDEF1E": Object { - "Description": "Artifact hash for asset \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5ArtifactHash6AF67D2F": Object { + "Description": "Artifact hash for asset \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3": Object { - "Description": "S3 bucket for asset \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45": Object { + "Description": "S3 bucket for asset \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502": Object { - "Description": "S3 key for asset version \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA": Object { + "Description": "S3 key for asset version \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fArtifactHashBC656546": Object { - "Description": "Artifact hash for asset \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aArtifactHash8AC382E7": Object { + "Description": "Artifact hash for asset \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B": Object { - "Description": "S3 bucket for asset \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629": Object { + "Description": "S3 bucket for asset \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9": Object { - "Description": "S3 key for asset version \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F": Object { + "Description": "S3 key for asset version \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, }, @@ -1089,7 +1089,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45", }, "S3Key": Object { "Fn::Join": Array [ @@ -1102,7 +1102,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA", }, ], }, @@ -1115,7 +1115,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA", }, ], }, @@ -1282,7 +1282,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629", }, "S3Key": Object { "Fn::Join": Array [ @@ -1295,7 +1295,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F", }, ], }, @@ -1308,7 +1308,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F", }, ], }, @@ -1610,28 +1610,28 @@ Object { exports[`Test deployment w/ existing producer function 1`] = ` Object { "Parameters": Object { - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384ArtifactHashE6BDEF1E": Object { - "Description": "Artifact hash for asset \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5ArtifactHash6AF67D2F": Object { + "Description": "Artifact hash for asset \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3": Object { - "Description": "S3 bucket for asset \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45": Object { + "Description": "S3 bucket for asset \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502": Object { - "Description": "S3 key for asset version \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA": Object { + "Description": "S3 key for asset version \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fArtifactHashBC656546": Object { - "Description": "Artifact hash for asset \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aArtifactHash8AC382E7": Object { + "Description": "Artifact hash for asset \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B": Object { - "Description": "S3 bucket for asset \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629": Object { + "Description": "S3 bucket for asset \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9": Object { - "Description": "S3 key for asset version \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F": Object { + "Description": "S3 key for asset version \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, }, @@ -1654,7 +1654,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629", }, "S3Key": Object { "Fn::Join": Array [ @@ -1667,7 +1667,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F", }, ], }, @@ -1680,7 +1680,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F", }, ], }, @@ -1993,7 +1993,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45", }, "S3Key": Object { "Fn::Join": Array [ @@ -2006,7 +2006,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA", }, ], }, @@ -2019,7 +2019,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA", }, ], }, @@ -2175,28 +2175,28 @@ Object { exports[`Test deployment w/ existing queue 1`] = ` Object { "Parameters": Object { - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384ArtifactHashE6BDEF1E": Object { - "Description": "Artifact hash for asset \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5ArtifactHash6AF67D2F": Object { + "Description": "Artifact hash for asset \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3": Object { - "Description": "S3 bucket for asset \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45": Object { + "Description": "S3 bucket for asset \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502": Object { - "Description": "S3 key for asset version \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA": Object { + "Description": "S3 key for asset version \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fArtifactHashBC656546": Object { - "Description": "Artifact hash for asset \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aArtifactHash8AC382E7": Object { + "Description": "Artifact hash for asset \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B": Object { - "Description": "S3 bucket for asset \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629": Object { + "Description": "S3 bucket for asset \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9": Object { - "Description": "S3 key for asset version \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F": Object { + "Description": "S3 key for asset version \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, }, @@ -2295,7 +2295,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629", }, "S3Key": Object { "Fn::Join": Array [ @@ -2308,7 +2308,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F", }, ], }, @@ -2321,7 +2321,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F", }, ], }, @@ -2475,7 +2475,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45", }, "S3Key": Object { "Fn::Join": Array [ @@ -2488,7 +2488,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA", }, ], }, @@ -2501,7 +2501,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA", }, ], }, @@ -2657,28 +2657,28 @@ Object { exports[`Test minimal deployment 1`] = ` Object { "Parameters": Object { - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384ArtifactHashE6BDEF1E": Object { - "Description": "Artifact hash for asset \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5ArtifactHash6AF67D2F": Object { + "Description": "Artifact hash for asset \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3": Object { - "Description": "S3 bucket for asset \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45": Object { + "Description": "S3 bucket for asset \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502": Object { - "Description": "S3 key for asset version \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA": Object { + "Description": "S3 key for asset version \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fArtifactHashBC656546": Object { - "Description": "Artifact hash for asset \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aArtifactHash8AC382E7": Object { + "Description": "Artifact hash for asset \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B": Object { - "Description": "S3 bucket for asset \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629": Object { + "Description": "S3 bucket for asset \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9": Object { - "Description": "S3 key for asset version \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F": Object { + "Description": "S3 key for asset version \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, }, @@ -2701,7 +2701,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629", }, "S3Key": Object { "Fn::Join": Array [ @@ -2714,7 +2714,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F", }, ], }, @@ -2727,7 +2727,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F", }, ], }, @@ -3040,7 +3040,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45", }, "S3Key": Object { "Fn::Join": Array [ @@ -3053,7 +3053,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA", }, ], }, @@ -3066,7 +3066,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA", }, ], }, @@ -3222,28 +3222,28 @@ Object { exports[`Test overrides for producer and consumer functions 1`] = ` Object { "Parameters": Object { - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384ArtifactHashE6BDEF1E": Object { - "Description": "Artifact hash for asset \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5ArtifactHash6AF67D2F": Object { + "Description": "Artifact hash for asset \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3": Object { - "Description": "S3 bucket for asset \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45": Object { + "Description": "S3 bucket for asset \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502": Object { - "Description": "S3 key for asset version \\"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\\"", + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA": Object { + "Description": "S3 key for asset version \\"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fArtifactHashBC656546": Object { - "Description": "Artifact hash for asset \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aArtifactHash8AC382E7": Object { + "Description": "Artifact hash for asset \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B": Object { - "Description": "S3 bucket for asset \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629": Object { + "Description": "S3 bucket for asset \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9": Object { - "Description": "S3 key for asset version \\"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\\"", + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F": Object { + "Description": "S3 key for asset version \\"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\\"", "Type": "String", }, }, @@ -3266,7 +3266,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629", }, "S3Key": Object { "Fn::Join": Array [ @@ -3279,7 +3279,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F", }, ], }, @@ -3292,7 +3292,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502", + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F", }, ], }, @@ -3605,7 +3605,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45", }, "S3Key": Object { "Fn::Join": Array [ @@ -3618,7 +3618,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA", }, ], }, @@ -3631,7 +3631,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9", + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA", }, ], }, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.defaultDeployment.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.defaultDeployment.expected.json index 333c064d6..bd04fb95e 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.defaultDeployment.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.defaultDeployment.expected.json @@ -109,7 +109,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3" + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629" }, "S3Key": { "Fn::Join": [ @@ -122,7 +122,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502" + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F" } ] } @@ -135,7 +135,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502" + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F" } ] } @@ -449,7 +449,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B" + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45" }, "S3Key": { "Fn::Join": [ @@ -462,7 +462,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9" + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA" } ] } @@ -475,7 +475,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9" + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA" } ] } @@ -533,29 +533,29 @@ } }, "Parameters": { - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3": { + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629": { "Type": "String", - "Description": "S3 bucket for asset \"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\"" + "Description": "S3 bucket for asset \"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\"" }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502": { + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F": { "Type": "String", - "Description": "S3 key for asset version \"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\"" + "Description": "S3 key for asset version \"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\"" }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384ArtifactHashE6BDEF1E": { + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aArtifactHash8AC382E7": { "Type": "String", - "Description": "Artifact hash for asset \"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\"" + "Description": "Artifact hash for asset \"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\"" }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B": { + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45": { "Type": "String", - "Description": "S3 bucket for asset \"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\"" + "Description": "S3 bucket for asset \"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\"" }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9": { + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA": { "Type": "String", - "Description": "S3 key for asset version \"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\"" + "Description": "S3 key for asset version \"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\"" }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fArtifactHashBC656546": { + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5ArtifactHash6AF67D2F": { "Type": "String", - "Description": "Artifact hash for asset \"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\"" + "Description": "Artifact hash for asset \"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\"" } } } \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.defaultDeployment.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.defaultDeployment.ts index 751f51334..968759801 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.defaultDeployment.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.defaultDeployment.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingConsumerFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingConsumerFunction.expected.json index 1f9a6dab5..a64fe79f8 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingConsumerFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingConsumerFunction.expected.json @@ -111,7 +111,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B" + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45" }, "S3Key": { "Fn::Join": [ @@ -124,7 +124,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9" + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA" } ] } @@ -137,7 +137,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9" + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA" } ] } @@ -301,7 +301,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3" + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629" }, "S3Key": { "Fn::Join": [ @@ -314,7 +314,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502" + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F" } ] } @@ -327,7 +327,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502" + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F" } ] } @@ -533,29 +533,29 @@ } }, "Parameters": { - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B": { + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45": { "Type": "String", - "Description": "S3 bucket for asset \"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\"" + "Description": "S3 bucket for asset \"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\"" }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9": { + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA": { "Type": "String", - "Description": "S3 key for asset version \"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\"" + "Description": "S3 key for asset version \"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\"" }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fArtifactHashBC656546": { + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5ArtifactHash6AF67D2F": { "Type": "String", - "Description": "Artifact hash for asset \"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\"" + "Description": "Artifact hash for asset \"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\"" }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3": { + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629": { "Type": "String", - "Description": "S3 bucket for asset \"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\"" + "Description": "S3 bucket for asset \"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\"" }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502": { + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F": { "Type": "String", - "Description": "S3 key for asset version \"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\"" + "Description": "S3 key for asset version \"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\"" }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384ArtifactHashE6BDEF1E": { + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aArtifactHash8AC382E7": { "Type": "String", - "Description": "Artifact hash for asset \"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\"" + "Description": "Artifact hash for asset \"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\"" } } } \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingConsumerFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingConsumerFunction.ts index 4f4200f95..11f7edc12 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingConsumerFunction.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingConsumerFunction.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingProducerFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingProducerFunction.expected.json index 8381b1585..cbb9e6587 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingProducerFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingProducerFunction.expected.json @@ -109,7 +109,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3" + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629" }, "S3Key": { "Fn::Join": [ @@ -122,7 +122,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502" + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F" } ] } @@ -135,7 +135,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502" + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F" } ] } @@ -449,7 +449,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B" + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45" }, "S3Key": { "Fn::Join": [ @@ -462,7 +462,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9" + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA" } ] } @@ -475,7 +475,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9" + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA" } ] } @@ -533,29 +533,29 @@ } }, "Parameters": { - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3": { + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629": { "Type": "String", - "Description": "S3 bucket for asset \"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\"" + "Description": "S3 bucket for asset \"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\"" }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502": { + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F": { "Type": "String", - "Description": "S3 key for asset version \"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\"" + "Description": "S3 key for asset version \"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\"" }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384ArtifactHashE6BDEF1E": { + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aArtifactHash8AC382E7": { "Type": "String", - "Description": "Artifact hash for asset \"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\"" + "Description": "Artifact hash for asset \"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\"" }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B": { + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45": { "Type": "String", - "Description": "S3 bucket for asset \"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\"" + "Description": "S3 bucket for asset \"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\"" }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9": { + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA": { "Type": "String", - "Description": "S3 key for asset version \"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\"" + "Description": "S3 key for asset version \"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\"" }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fArtifactHashBC656546": { + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5ArtifactHash6AF67D2F": { "Type": "String", - "Description": "Artifact hash for asset \"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\"" + "Description": "Artifact hash for asset \"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\"" } } } \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingProducerFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingProducerFunction.ts index 351d5b373..91a9d0d38 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingProducerFunction.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingProducerFunction.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingQueue.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingQueue.expected.json index 8024fe17b..9b2bdcea3 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingQueue.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingQueue.expected.json @@ -184,7 +184,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3" + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629" }, "S3Key": { "Fn::Join": [ @@ -197,7 +197,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502" + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F" } ] } @@ -210,7 +210,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502" + "Ref": "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F" } ] } @@ -365,7 +365,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B" + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45" }, "S3Key": { "Fn::Join": [ @@ -378,7 +378,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9" + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA" } ] } @@ -391,7 +391,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9" + "Ref": "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA" } ] } @@ -449,29 +449,29 @@ } }, "Parameters": { - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3BucketED6CBBC3": { + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3Bucket340F7629": { "Type": "String", - "Description": "S3 bucket for asset \"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\"" + "Description": "S3 bucket for asset \"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\"" }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384S3VersionKeyD468D502": { + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aS3VersionKey2054120F": { "Type": "String", - "Description": "S3 key for asset version \"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\"" + "Description": "S3 key for asset version \"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\"" }, - "AssetParameters12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384ArtifactHashE6BDEF1E": { + "AssetParameters670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206aArtifactHash8AC382E7": { "Type": "String", - "Description": "Artifact hash for asset \"12e86b91cfa54b90f7340bb07d9ad6f4fc16982bfaa0212c9bdc2ab5e7885384\"" + "Description": "Artifact hash for asset \"670cd3ad46e9feac5a92bbf55746e52324459dac0ea00dd6a214a7a8ce05206a\"" }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3BucketFA87CD7B": { + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3Bucket86ED5E45": { "Type": "String", - "Description": "S3 bucket for asset \"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\"" + "Description": "S3 bucket for asset \"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\"" }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fS3VersionKey9E5641A9": { + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5S3VersionKey24D05EBA": { "Type": "String", - "Description": "S3 key for asset version \"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\"" + "Description": "S3 key for asset version \"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\"" }, - "AssetParametersff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9fArtifactHashBC656546": { + "AssetParameters3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5ArtifactHash6AF67D2F": { "Type": "String", - "Description": "Artifact hash for asset \"ff5def7864b956d3f78b30d40479bf3f254cf58be622c9f3559c4b5915fafa9f\"" + "Description": "Artifact hash for asset \"3bf31d2e69ca582971f645cca0be83ead5dfbc80bd36b3e487100422c68243a5\"" } } } \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingQueue.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingQueue.ts index ef505d9f1..958893dba 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingQueue.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/integ.existingQueue.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/lambda-sqs-lambda.test.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/lambda-sqs-lambda.test.ts index 410f56ee5..e85fbf21d 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/lambda-sqs-lambda.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/lambda-sqs-lambda.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/lambda/consumer-function/index.js b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/lambda/consumer-function/index.js index 0b76ae9aa..53ab9ba9d 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/lambda/consumer-function/index.js +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/lambda/consumer-function/index.js @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/lambda/producer-function/index.js b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/lambda/producer-function/index.js index fd6df9ade..72288a394 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/lambda/producer-function/index.js +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/lambda/producer-function/index.js @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/lib/index.ts index d8ea2b2bb..4516ac68a 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/package.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/package.json index 62f1a80d4..150e4760f 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-lambda-sqs", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK constructs for defining an interaction between an AWS Lambda function and an Amazon SQS queue.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,14 +53,14 @@ } }, "dependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -70,10 +70,10 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/__snapshots__/lambda-sqs.test.js.snap b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/__snapshots__/lambda-sqs.test.js.snap index a7993343a..e454da20f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/__snapshots__/lambda-sqs.test.js.snap +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/__snapshots__/lambda-sqs.test.js.snap @@ -3,16 +3,16 @@ exports[`Test deployment w/ DLQ and purging enabled 1`] = ` Object { "Parameters": Object { - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913ArtifactHash452EF11C": Object { - "Description": "Artifact hash for asset \\"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\\"", + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bArtifactHash81FE0B06": Object { + "Description": "Artifact hash for asset \\"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\\"", "Type": "String", }, - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3Bucket642A6F72": Object { - "Description": "S3 bucket for asset \\"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\\"", + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3Bucket99C6FD3D": Object { + "Description": "S3 bucket for asset \\"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\\"", "Type": "String", }, - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3": Object { - "Description": "S3 key for asset version \\"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\\"", + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED": Object { + "Description": "S3 key for asset version \\"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\\"", "Type": "String", }, }, @@ -35,7 +35,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3Bucket642A6F72", + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3Bucket99C6FD3D", }, "S3Key": Object { "Fn::Join": Array [ @@ -48,7 +48,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3", + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED", }, ], }, @@ -61,7 +61,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3", + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED", }, ], }, @@ -376,16 +376,16 @@ Object { exports[`Test deployment w/ DLQ disabled 1`] = ` Object { "Parameters": Object { - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913ArtifactHash452EF11C": Object { - "Description": "Artifact hash for asset \\"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\\"", + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bArtifactHash81FE0B06": Object { + "Description": "Artifact hash for asset \\"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\\"", "Type": "String", }, - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3Bucket642A6F72": Object { - "Description": "S3 bucket for asset \\"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\\"", + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3Bucket99C6FD3D": Object { + "Description": "S3 bucket for asset \\"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\\"", "Type": "String", }, - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3": Object { - "Description": "S3 key for asset version \\"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\\"", + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED": Object { + "Description": "S3 key for asset version \\"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\\"", "Type": "String", }, }, @@ -408,7 +408,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3Bucket642A6F72", + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3Bucket99C6FD3D", }, "S3Key": Object { "Fn::Join": Array [ @@ -421,7 +421,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3", + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED", }, ], }, @@ -434,7 +434,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3", + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED", }, ], }, @@ -666,16 +666,16 @@ Object { exports[`Test deployment w/ existing queue 1`] = ` Object { "Parameters": Object { - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913ArtifactHash452EF11C": Object { - "Description": "Artifact hash for asset \\"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\\"", + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bArtifactHash81FE0B06": Object { + "Description": "Artifact hash for asset \\"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\\"", "Type": "String", }, - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3Bucket642A6F72": Object { - "Description": "S3 bucket for asset \\"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\\"", + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3Bucket99C6FD3D": Object { + "Description": "S3 bucket for asset \\"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\\"", "Type": "String", }, - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3": Object { - "Description": "S3 key for asset version \\"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\\"", + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED": Object { + "Description": "S3 key for asset version \\"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\\"", "Type": "String", }, }, @@ -704,7 +704,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3Bucket642A6F72", + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3Bucket99C6FD3D", }, "S3Key": Object { "Fn::Join": Array [ @@ -717,7 +717,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3", + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED", }, ], }, @@ -730,7 +730,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3", + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED", }, ], }, @@ -886,16 +886,16 @@ Object { exports[`Test deployment w/ purging disabled 1`] = ` Object { "Parameters": Object { - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913ArtifactHash452EF11C": Object { - "Description": "Artifact hash for asset \\"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\\"", + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bArtifactHash81FE0B06": Object { + "Description": "Artifact hash for asset \\"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\\"", "Type": "String", }, - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3Bucket642A6F72": Object { - "Description": "S3 bucket for asset \\"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\\"", + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3Bucket99C6FD3D": Object { + "Description": "S3 bucket for asset \\"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\\"", "Type": "String", }, - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3": Object { - "Description": "S3 key for asset version \\"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\\"", + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED": Object { + "Description": "S3 key for asset version \\"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\\"", "Type": "String", }, }, @@ -918,7 +918,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3Bucket642A6F72", + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3Bucket99C6FD3D", }, "S3Key": Object { "Fn::Join": Array [ @@ -931,7 +931,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3", + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED", }, ], }, @@ -944,7 +944,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3", + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED", }, ], }, @@ -1245,16 +1245,16 @@ Object { exports[`Test minimal deployment with new Lambda function 1`] = ` Object { "Parameters": Object { - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913ArtifactHash452EF11C": Object { - "Description": "Artifact hash for asset \\"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\\"", + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bArtifactHash81FE0B06": Object { + "Description": "Artifact hash for asset \\"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\\"", "Type": "String", }, - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3Bucket642A6F72": Object { - "Description": "S3 bucket for asset \\"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\\"", + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3Bucket99C6FD3D": Object { + "Description": "S3 bucket for asset \\"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\\"", "Type": "String", }, - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3": Object { - "Description": "S3 key for asset version \\"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\\"", + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED": Object { + "Description": "S3 key for asset version \\"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\\"", "Type": "String", }, }, @@ -1277,7 +1277,7 @@ Object { "Properties": Object { "Code": Object { "S3Bucket": Object { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3Bucket642A6F72", + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3Bucket99C6FD3D", }, "S3Key": Object { "Fn::Join": Array [ @@ -1290,7 +1290,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3", + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED", }, ], }, @@ -1303,7 +1303,7 @@ Object { "Fn::Split": Array [ "||", Object { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3", + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED", }, ], }, diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.expected.json index 986110cf4..9b689f038 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.expected.json @@ -109,7 +109,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3Bucket642A6F72" + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3Bucket99C6FD3D" }, "S3Key": { "Fn::Join": [ @@ -122,7 +122,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3" + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED" } ] } @@ -135,7 +135,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3" + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED" } ] } @@ -341,17 +341,17 @@ } }, "Parameters": { - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3Bucket642A6F72": { + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3Bucket99C6FD3D": { "Type": "String", - "Description": "S3 bucket for asset \"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\"" + "Description": "S3 bucket for asset \"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\"" }, - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3": { + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED": { "Type": "String", - "Description": "S3 key for asset version \"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\"" + "Description": "S3 key for asset version \"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\"" }, - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913ArtifactHash452EF11C": { + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bArtifactHash81FE0B06": { "Type": "String", - "Description": "Artifact hash for asset \"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\"" + "Description": "Artifact hash for asset \"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\"" } } } \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.ts index db2c33a64..f084836e1 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.expected.json index 96a13a2c1..66e0e1f75 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.expected.json @@ -109,7 +109,7 @@ "Properties": { "Code": { "S3Bucket": { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3Bucket642A6F72" + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3Bucket99C6FD3D" }, "S3Key": { "Fn::Join": [ @@ -122,7 +122,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3" + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED" } ] } @@ -135,7 +135,7 @@ "Fn::Split": [ "||", { - "Ref": "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3" + "Ref": "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED" } ] } @@ -341,17 +341,17 @@ } }, "Parameters": { - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3Bucket642A6F72": { + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3Bucket99C6FD3D": { "Type": "String", - "Description": "S3 bucket for asset \"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\"" + "Description": "S3 bucket for asset \"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\"" }, - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913S3VersionKeyDBE0BAD3": { + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bS3VersionKey7DE82FED": { "Type": "String", - "Description": "S3 key for asset version \"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\"" + "Description": "S3 key for asset version \"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\"" }, - "AssetParameters0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913ArtifactHash452EF11C": { + "AssetParameters8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2bArtifactHash81FE0B06": { "Type": "String", - "Description": "Artifact hash for asset \"0a8a28cfd21b2481ab3395199806266e35521d7d2bd264025d6c9b7198460913\"" + "Description": "Artifact hash for asset \"8522cf47e408b8532776f54567f9fd125e5ee78fb2dadb4aa7014d320a77fa2b\"" } } } \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.ts index 8879873ec..16ef06e3b 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/lambda-sqs.test.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/lambda-sqs.test.ts index 8e7fbbd63..7a2b7b0fa 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/lambda-sqs.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/lambda-sqs.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/lambda/index.js b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/lambda/index.js index 5f6dd811f..386796c72 100755 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/lambda/index.js +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/lambda/index.js @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/README.md b/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/README.md index d8636f030..5a19d61e9 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/README.md +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/README.md @@ -64,6 +64,7 @@ _Parameters_ |existingLambdaObj?|[`lambda.Function`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.Function.html)|Existing instance of Lambda Function object, if this is set then the lambdaFunctionProps is ignored.| |lambdaFunctionProps?|[`lambda.FunctionProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.FunctionProps.html)|User provided props to override the default props for the Lambda function.| |stateMachineProps|[`sfn.StateMachineProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-stepfunctions.StateMachineProps.html)|User provided props for the sfn.StateMachine.| +|createCloudWatchAlarms|`boolean`|Whether to create recommended CloudWatch alarms| ## Pattern Properties @@ -72,7 +73,7 @@ _Parameters_ |lambdaFunction|[`lambda.Function`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.Function.html)|Returns an instance of the Lambda function created by the pattern.| |stateMachine|[`sfn.StateMachine`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-stepfunctions.StateMachine.html)|Returns an instance of StateMachine created by the construct.| |stateMachineLogGroup|[`logs.LogGroup`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-logs.LogGroup.html)|Returns an instance of the LogGroup created by the construct for StateMachine| -|cloudwatchAlarms|[`cloudwatch.Alarm[]`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudwatch.Alarm.html)|Returns a list of alarms created by the construct. +|cloudwatchAlarms?|[`cloudwatch.Alarm[]`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudwatch.Alarm.html)|Returns a list of alarms created by the construct. ## Default settings diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/lib/index.ts index 8b254c319..7e5f8e1c4 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at @@ -40,7 +40,13 @@ export interface LambdaToStepFunctionProps { * * @default - None */ - readonly stateMachineProps: sfn.StateMachineProps + readonly stateMachineProps: sfn.StateMachineProps, + /** + * Whether to create recommended CloudWatch alarms + * + * @default - Alarms are created + */ + readonly createCloudWatchAlarms?: boolean } /** @@ -50,7 +56,7 @@ export class LambdaToStepFunction extends Construct { public readonly lambdaFunction: lambda.Function; public readonly stateMachine: sfn.StateMachine; public readonly stateMachineLogGroup: LogGroup; - public readonly cloudwatchAlarms: cloudwatch.Alarm[]; + public readonly cloudwatchAlarms?: cloudwatch.Alarm[]; /** * @summary Constructs a new instance of the LambdaToStepFunctionProps class. @@ -78,7 +84,9 @@ export class LambdaToStepFunction extends Construct { // Grant the start execution permission to the Lambda function this.stateMachine.grantStartExecution(this.lambdaFunction); - // Deploy best-practice CloudWatch Alarm for state machine - this.cloudwatchAlarms = defaults.buildStepFunctionCWAlarms(this, this.stateMachine); + if (props.createCloudWatchAlarms === undefined || props.createCloudWatchAlarms) { + // Deploy best-practice CloudWatch Alarm for state machine + this.cloudwatchAlarms = defaults.buildStepFunctionCWAlarms(this, this.stateMachine); + } } } \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/package.json b/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/package.json index c0efaaa1a..086680958 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-lambda-step-function", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK constructs for defining an interaction between an AWS Lambda function and an AWS Step Function.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,16 +53,16 @@ } }, "dependencies": { - "@aws-cdk/aws-cloudwatch": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-stepfunctions": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-cloudwatch": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-stepfunctions": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0", "eslint-plugin-import": "^2.22.0" @@ -73,12 +73,12 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-cloudwatch": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-stepfunctions": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-cloudwatch": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-stepfunctions": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-logs": "~1.66.0" + "@aws-cdk/aws-logs": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/test/integ.deploy-lambda.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/test/integ.deploy-lambda.ts index 431f92c01..e8f5d587b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/test/integ.deploy-lambda.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/test/integ.deploy-lambda.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/test/integ.existing-function.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/test/integ.existing-function.ts index dce737a44..44c6d8e7f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/test/integ.existing-function.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/test/integ.existing-function.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/test/lambda-step-function.test.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/test/lambda-step-function.test.ts index 4d8faf044..39876b316 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/test/lambda-step-function.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-step-function/test/lambda-step-function.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at @@ -139,7 +139,7 @@ test('Test invocation permissions', () => { }); // -------------------------------------------------------------- -// Test the getter methods +// Test the properties // -------------------------------------------------------------- test('Test the properties', () => { // Stack @@ -169,4 +169,35 @@ test('Test the properties', () => { const cwAlarm = pattern.cloudwatchAlarms; expect(cwAlarm !== null); expect(pattern.stateMachineLogGroup !== null); +}); + +// -------------------------------------------------------------- +// Test the properties +// -------------------------------------------------------------- +test('Test the properties with no CW Alarms', () => { + // Stack + const stack = new Stack(); + // Helper declaration + const startState = new stepfunctions.Pass(stack, 'StartState'); + const pattern = new LambdaToStepFunction(stack, 'lambda-to-step-function-stack', { + lambdaFunctionProps: { + runtime: lambda.Runtime.NODEJS_10_X, + handler: 'index.handler', + code: lambda.Code.fromAsset(`${__dirname}/lambda`), + environment: { + LAMBDA_NAME: 'existing-function' + } + }, + stateMachineProps: { + definition: startState + }, + createCloudWatchAlarms: false + }); + // Assertion 1 + expect(pattern.lambdaFunction !== null); + // Assertion 2 + expect(pattern.stateMachine !== null); + // Assertion 3 + expect(pattern.cloudwatchAlarms === null); + expect(pattern.stateMachineLogGroup !== null); }); \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/lib/index.ts index 218964f4f..5aab24952 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/package.json index 59beb88ce..76549df91 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-s3-lambda", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for AWS S3 to AWS Lambda integration", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,17 +53,17 @@ } }, "dependencies": { - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/aws-s3-notifications": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-lambda-event-sources": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/aws-s3-notifications": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-lambda-event-sources": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -73,13 +73,13 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-cdk/aws-lambda-event-sources": "~1.66.0", - "@aws-cdk/aws-s3-notifications": "~1.66.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-cdk/aws-lambda-event-sources": "~1.67.0", + "@aws-cdk/aws-s3-notifications": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.existing-s3-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.existing-s3-bucket.ts index d625e9cbe..dc0ffe66c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.existing-s3-bucket.ts +++ b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.existing-s3-bucket.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.no-arguments.ts index 2d9bb2de0..11478d160 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/s3-lambda.test.ts b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/s3-lambda.test.ts index 1f90bfa07..f26f2c072 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/s3-lambda.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/s3-lambda.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-step-function/README.md b/source/patterns/@aws-solutions-constructs/aws-s3-step-function/README.md index 8cfaee564..c9327a87c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-step-function/README.md +++ b/source/patterns/@aws-solutions-constructs/aws-s3-step-function/README.md @@ -60,6 +60,7 @@ _Parameters_ |stateMachineProps|[`sfn.StateMachineProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-stepfunctions.StateMachineProps.html)|Optional user provided props to override the default props for sfn.StateMachine| |eventRuleProps?|[`events.RuleProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-events.RuleProps.html)|Optional user provided eventRuleProps to override the defaults| |deployCloudTrail?|`boolean`|Whether to deploy a Trail in AWS CloudTrail to log API events in Amazon S3| +|createCloudWatchAlarms|`boolean`|Whether to create recommended CloudWatch alarms| ## Pattern Properties @@ -67,7 +68,7 @@ _Parameters_ |:-------------|:----------------|-----------------| |stateMachine|[`sfn.StateMachine`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-stepfunctions.StateMachine.html)|Returns an instance of sfn.StateMachine created by the construct| |stateMachineLogGroup|[`logs.LogGroup`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-logs.LogGroup.html)|Returns an instance of the LogGroup created by the construct for StateMachine| -|cloudwatchAlarms|[`cloudwatch.Alarm[]`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudwatch.Alarm.html)|Returns a list of cloudwatch.Alarm created by the construct| +|cloudwatchAlarms?|[`cloudwatch.Alarm[]`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudwatch.Alarm.html)|Returns a list of cloudwatch.Alarm created by the construct| |s3Bucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.Bucket.html)|Returns an instance of the s3.Bucket created by the construct| |s3LoggingBucket?|[`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.Bucket.html)|Returns an instance of s3.Bucket created by the construct as the logging bucket for the primary bucket.| |cloudtrail|[`cloudtrail.Trail`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudtrail.Trail.html)|Returns an instance of the cloudtrail.Trail created by the construct| diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-step-function/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-s3-step-function/lib/index.ts index 04f017829..1cce5e93f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-step-function/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-s3-step-function/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at @@ -54,7 +54,13 @@ export interface S3ToStepFunctionProps { * * @default - true */ - readonly deployCloudTrail?: boolean + readonly deployCloudTrail?: boolean, + /** + * Whether to create recommended CloudWatch alarms + * + * @default - Alarms are created + */ + readonly createCloudWatchAlarms?: boolean } export class S3ToStepFunction extends Construct { @@ -62,7 +68,7 @@ export class S3ToStepFunction extends Construct { public readonly stateMachineLogGroup: LogGroup; public readonly s3Bucket?: s3.Bucket; public readonly s3LoggingBucket?: s3.Bucket; - public readonly cloudwatchAlarms: cloudwatch.Alarm[]; + public readonly cloudwatchAlarms?: cloudwatch.Alarm[]; public readonly cloudtrail?: cloudtrail.Trail; public readonly cloudtrailBucket?: s3.Bucket; public readonly cloudtrailLoggingBucket?: s3.Bucket; @@ -88,7 +94,7 @@ export class S3ToStepFunction extends Construct { bucket = props.existingBucketObj; } - if (!props.hasOwnProperty('deployCloudTrail') || props.deployCloudTrail === true) { + if (props.deployCloudTrail === undefined || props.deployCloudTrail) { [this.cloudtrailBucket, this.cloudtrailLoggingBucket] = defaults.buildS3Bucket(this, {}, 'CloudTrail'); this.cloudtrail = new cloudtrail.Trail(this, 'S3EventsTrail', { @@ -131,7 +137,8 @@ export class S3ToStepFunction extends Construct { const eventsRuleToStepFunction = new EventsRuleToStepFunction(this, 'test-events-rule-step-function-stack', { stateMachineProps: props.stateMachineProps, - eventRuleProps: _eventRuleProps + eventRuleProps: _eventRuleProps, + createCloudWatchAlarms: props.createCloudWatchAlarms }); this.stateMachine = eventsRuleToStepFunction.stateMachine; diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-step-function/package.json b/source/patterns/@aws-solutions-constructs/aws-s3-step-function/package.json index f48a73c51..cb0e09f9e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-step-function/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-s3-step-function/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-s3-step-function", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for AWS S3 to AWS Step Function integration", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,22 +53,22 @@ } }, "dependencies": { - "@aws-cdk/aws-stepfunctions": "~1.66.0", - "@aws-cdk/aws-stepfunctions-tasks": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-cloudwatch": "~1.66.0", - "@aws-cdk/aws-cloudtrail": "~1.66.0", - "@aws-cdk/aws-events": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-solutions-constructs/aws-events-rule-step-function": "~1.66.0", + "@aws-cdk/aws-stepfunctions": "~1.67.0", + "@aws-cdk/aws-stepfunctions-tasks": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-cloudwatch": "~1.67.0", + "@aws-cdk/aws-cloudtrail": "~1.67.0", + "@aws-cdk/aws-events": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-solutions-constructs/aws-events-rule-step-function": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -78,18 +78,18 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-stepfunctions": "~1.66.0", - "@aws-cdk/aws-stepfunctions-tasks": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-cloudwatch": "~1.66.0", - "@aws-cdk/aws-cloudtrail": "~1.66.0", - "@aws-cdk/aws-events": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-solutions-constructs/aws-events-rule-step-function": "~1.66.0", + "@aws-cdk/aws-stepfunctions": "~1.67.0", + "@aws-cdk/aws-stepfunctions-tasks": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-cloudwatch": "~1.67.0", + "@aws-cdk/aws-cloudtrail": "~1.67.0", + "@aws-cdk/aws-events": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-solutions-constructs/aws-events-rule-step-function": "~1.67.0", "constructs": "^3.0.4", - "@aws-cdk/aws-logs": "~1.66.0" + "@aws-cdk/aws-logs": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-step-function/test/integ.pre-existing-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-s3-step-function/test/integ.pre-existing-bucket.ts index 837b9bad6..0e58e4b0e 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-step-function/test/integ.pre-existing-bucket.ts +++ b/source/patterns/@aws-solutions-constructs/aws-s3-step-function/test/integ.pre-existing-bucket.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-step-function/test/integ.s3-step-function-no-argument.ts b/source/patterns/@aws-solutions-constructs/aws-s3-step-function/test/integ.s3-step-function-no-argument.ts index b2f816329..6f65ce7c3 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-step-function/test/integ.s3-step-function-no-argument.ts +++ b/source/patterns/@aws-solutions-constructs/aws-s3-step-function/test/integ.s3-step-function-no-argument.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-s3-step-function/test/s3-step-function.test.ts b/source/patterns/@aws-solutions-constructs/aws-s3-step-function/test/s3-step-function.test.ts index ed1725773..1993a1381 100644 --- a/source/patterns/@aws-solutions-constructs/aws-s3-step-function/test/s3-step-function.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-s3-step-function/test/s3-step-function.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-sns-lambda/lib/index.ts index 1e18b8be4..cd1abcdd9 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-lambda/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-sns-lambda/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-sns-lambda/package.json index 3c89ae142..c09cd9080 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-lambda/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-sns-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-sns-lambda", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK Constructs for AWS SNS to AWS Lambda integration", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,17 +53,17 @@ } }, "dependencies": { - "@aws-cdk/aws-sns": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-lambda-event-sources": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-sns": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-lambda-event-sources": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -73,13 +73,13 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-sns": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-lambda-event-sources": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", + "@aws-cdk/aws-sns": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-lambda-event-sources": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/integ.no-arguments.ts index 270a682fc..db7c3b9b0 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/sns-lambda.test.ts b/source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/sns-lambda.test.ts index 32a3eaa55..e8422cf50 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/sns-lambda.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-sns-lambda/test/sns-lambda.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/lib/index.ts index 5399a2247..8b84a71a2 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/package.json b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/package.json index 71eadaa96..0b535e846 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-sns-sqs", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK constructs for defining an interaction between an Amazon SNS topic and an Amazon SQS queue.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,17 +53,17 @@ } }, "dependencies": { - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-sns": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/aws-sns-subscriptions": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-sns": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/aws-sns-subscriptions": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -73,13 +73,13 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-sns": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/aws-sns-subscriptions": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-sns": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/aws-sns-subscriptions": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.existing-kms-key.ts b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.existing-kms-key.ts index 8b95776e1..6e7f26ba0 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.existing-kms-key.ts +++ b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.existing-kms-key.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.no-arguments.ts b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.no-arguments.ts index 5920af7db..0d67b8f67 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.no-arguments.ts +++ b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.no-arguments.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.sns-managed-kms-key.ts b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.sns-managed-kms-key.ts index c76cc7385..76d066602 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.sns-managed-kms-key.ts +++ b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/integ.sns-managed-kms-key.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/sns-sqs.test.ts b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/sns-sqs.test.ts index 61af7a52c..7f7ec7d7a 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/sns-sqs.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-sns-sqs/test/sns-sqs.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/lib/index.ts index bdf0d64c7..ad5d31ad0 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/lib/index.ts +++ b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/package.json index 419d44e12..34abd64f2 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/package.json +++ b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-sqs-lambda", - "version": "1.66.0", + "version": "1.67.0", "description": "CDK constructs for defining an interaction between an Amazon SQS queue and an AWS Lambda function.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,16 +53,16 @@ } }, "dependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-lambda-event-sources": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-lambda-event-sources": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -72,12 +72,12 @@ ] }, "peerDependencies": { - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-lambda-event-sources": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-lambda-event-sources": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "constructs": "^3.0.4" } } diff --git a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFifoQueue.ts b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFifoQueue.ts index a387da3b4..50a20129f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFifoQueue.ts +++ b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFifoQueue.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFunction.ts b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFunction.ts index d58d6fd26..0cc86a470 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFunction.ts +++ b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.deployFunction.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.existingFunction.ts b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.existingFunction.ts index 50a85b39e..ecf59dc6b 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.existingFunction.ts +++ b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/integ.existingFunction.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/test.sqs-lambda.test.ts b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/test.sqs-lambda.test.ts index 5e6e35bc1..edbfee310 100644 --- a/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/test.sqs-lambda.test.ts +++ b/source/patterns/@aws-solutions-constructs/aws-sqs-lambda/test/test.sqs-lambda.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/index.ts b/source/patterns/@aws-solutions-constructs/core/index.ts index 3959e71c2..5a78460ee 100644 --- a/source/patterns/@aws-solutions-constructs/core/index.ts +++ b/source/patterns/@aws-solutions-constructs/core/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/apigateway-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/apigateway-defaults.ts index 995acb254..5cbb1ab8d 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/apigateway-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/apigateway-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/apigateway-helper.ts b/source/patterns/@aws-solutions-constructs/core/lib/apigateway-helper.ts index d05aa1633..231689e1e 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/apigateway-helper.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/apigateway-helper.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/cloudfront-distribution-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/cloudfront-distribution-defaults.ts index d7084fc4a..f5eb8bc08 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/cloudfront-distribution-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/cloudfront-distribution-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/cloudfront-distribution-helper.ts b/source/patterns/@aws-solutions-constructs/core/lib/cloudfront-distribution-helper.ts index b07732d0f..ee140e76a 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/cloudfront-distribution-helper.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/cloudfront-distribution-helper.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/cloudwatch-log-group-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/cloudwatch-log-group-defaults.ts index 141fe174a..8ae1a2e15 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/cloudwatch-log-group-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/cloudwatch-log-group-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/cognito-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/cognito-defaults.ts index b761570b1..6f4c6d7ec 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/cognito-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/cognito-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/cognito-helper.ts b/source/patterns/@aws-solutions-constructs/core/lib/cognito-helper.ts index 7918c82cc..1d56bcdbf 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/cognito-helper.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/cognito-helper.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/dynamodb-table-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/dynamodb-table-defaults.ts index 0e72f164a..b108ed085 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/dynamodb-table-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/dynamodb-table-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/dynamodb-table-helper.ts b/source/patterns/@aws-solutions-constructs/core/lib/dynamodb-table-helper.ts index d516d6e44..28c44f0d7 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/dynamodb-table-helper.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/dynamodb-table-helper.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/elasticsearch-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/elasticsearch-defaults.ts index e9f5b0190..3457934ed 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/elasticsearch-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/elasticsearch-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/elasticsearch-helper.ts b/source/patterns/@aws-solutions-constructs/core/lib/elasticsearch-helper.ts index e4e964e0d..122cbd058 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/elasticsearch-helper.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/elasticsearch-helper.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/events-rule-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/events-rule-defaults.ts index 2d34ca3b6..32e04451d 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/events-rule-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/events-rule-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/iot-topic-rule-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/iot-topic-rule-defaults.ts index 20c1173a2..d784c2d03 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/iot-topic-rule-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/iot-topic-rule-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/kinesis-analytics-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/kinesis-analytics-defaults.ts index a70ac5ada..6b955d918 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/kinesis-analytics-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/kinesis-analytics-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/kinesis-analytics-helper.ts b/source/patterns/@aws-solutions-constructs/core/lib/kinesis-analytics-helper.ts index aec263367..6be5c6e10 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/kinesis-analytics-helper.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/kinesis-analytics-helper.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/kinesis-firehose-s3-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/kinesis-firehose-s3-defaults.ts index 3b478853e..8e5410900 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/kinesis-firehose-s3-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/kinesis-firehose-s3-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/kinesis-streams-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/kinesis-streams-defaults.ts index 11fe21d18..2eba97d61 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/kinesis-streams-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/kinesis-streams-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/kinesis-streams-helper.ts b/source/patterns/@aws-solutions-constructs/core/lib/kinesis-streams-helper.ts index 69f03a819..781fcaacd 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/kinesis-streams-helper.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/kinesis-streams-helper.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/kms-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/kms-defaults.ts index 589eb8d22..8691b5336 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/kms-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/kms-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/kms-helper.ts b/source/patterns/@aws-solutions-constructs/core/lib/kms-helper.ts index 0f5a4b858..b04537b37 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/kms-helper.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/kms-helper.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/lambda-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/lambda-defaults.ts index 660353758..1a8344ed5 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/lambda-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/lambda-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/lambda-event-source-mapping-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/lambda-event-source-mapping-defaults.ts index ea17f5131..4f123507a 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/lambda-event-source-mapping-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/lambda-event-source-mapping-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/lambda-helper.ts b/source/patterns/@aws-solutions-constructs/core/lib/lambda-helper.ts index de700976a..49a7e9f03 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/lambda-helper.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/lambda-helper.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/override-warning-service.ts b/source/patterns/@aws-solutions-constructs/core/lib/override-warning-service.ts index 28a5f96cc..283a45d70 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/override-warning-service.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/override-warning-service.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/s3-bucket-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/s3-bucket-defaults.ts index 7d6b7e466..2cf79f52b 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/s3-bucket-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/s3-bucket-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/s3-bucket-helper.ts b/source/patterns/@aws-solutions-constructs/core/lib/s3-bucket-helper.ts index 641f103e8..f91deac2b 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/s3-bucket-helper.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/s3-bucket-helper.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/sns-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/sns-defaults.ts index fd88fbf50..9954ef90e 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/sns-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/sns-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/sns-helper.ts b/source/patterns/@aws-solutions-constructs/core/lib/sns-helper.ts index 6d03c8343..632b7cb66 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/sns-helper.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/sns-helper.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/sqs-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/sqs-defaults.ts index 590c66470..f06101675 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/sqs-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/sqs-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/sqs-helper.ts b/source/patterns/@aws-solutions-constructs/core/lib/sqs-helper.ts index 45125d927..2ea90ec1d 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/sqs-helper.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/sqs-helper.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/step-function-defaults.ts b/source/patterns/@aws-solutions-constructs/core/lib/step-function-defaults.ts index 21160ba9b..df2f2c74d 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/step-function-defaults.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/step-function-defaults.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/step-function-helper.ts b/source/patterns/@aws-solutions-constructs/core/lib/step-function-helper.ts index 3649f1f93..8930f8906 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/step-function-helper.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/step-function-helper.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/lib/utils.ts b/source/patterns/@aws-solutions-constructs/core/lib/utils.ts index a255dfde2..d92cd8fa8 100644 --- a/source/patterns/@aws-solutions-constructs/core/lib/utils.ts +++ b/source/patterns/@aws-solutions-constructs/core/lib/utils.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/package.json b/source/patterns/@aws-solutions-constructs/core/package.json index 0b4f7fbbc..87a082eab 100644 --- a/source/patterns/@aws-solutions-constructs/core/package.json +++ b/source/patterns/@aws-solutions-constructs/core/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/core", - "version": "1.66.0", + "version": "1.67.0", "description": "Core CDK Construct for patterns library", "main": "index.js", "types": "index.ts", @@ -52,28 +52,28 @@ } }, "dependencies": { - "@aws-cdk/aws-cloudfront": "~1.66.0", - "@aws-cdk/aws-cloudfront-origins": "~1.66.0", - "@aws-cdk/aws-dynamodb": "~1.66.0", - "@aws-cdk/aws-iot": "~1.66.0", - "@aws-cdk/aws-kinesis": "~1.66.0", - "@aws-cdk/aws-kinesisanalytics": "~1.66.0", - "@aws-cdk/aws-kinesisfirehose": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-lambda-event-sources": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/aws-sns": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-cdk/aws-events": "~1.66.0", - "@aws-cdk/aws-cognito": "~1.66.0", - "@aws-cdk/aws-elasticsearch": "~1.66.0", - "@aws-cdk/aws-cloudwatch": "~1.66.0", - "@aws-cdk/aws-stepfunctions": "~1.66.0", + "@aws-cdk/aws-cloudfront": "~1.67.0", + "@aws-cdk/aws-cloudfront-origins": "~1.67.0", + "@aws-cdk/aws-dynamodb": "~1.67.0", + "@aws-cdk/aws-iot": "~1.67.0", + "@aws-cdk/aws-kinesis": "~1.67.0", + "@aws-cdk/aws-kinesisanalytics": "~1.67.0", + "@aws-cdk/aws-kinesisfirehose": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-lambda-event-sources": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/aws-sns": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-cdk/aws-events": "~1.67.0", + "@aws-cdk/aws-cognito": "~1.67.0", + "@aws-cdk/aws-elasticsearch": "~1.67.0", + "@aws-cdk/aws-cloudwatch": "~1.67.0", + "@aws-cdk/aws-stepfunctions": "~1.67.0", "@types/deep-diff": "^1.0.0", "@types/npmlog": "^4.1.2", "deep-diff": "^1.0.2", @@ -81,7 +81,7 @@ "npmlog": "^4.1.2" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -98,27 +98,27 @@ "@types/deep-diff" ], "peerDependencies": { - "@aws-cdk/aws-cloudfront": "~1.66.0", - "@aws-cdk/aws-dynamodb": "~1.66.0", - "@aws-cdk/aws-iot": "~1.66.0", - "@aws-cdk/aws-kinesis": "~1.66.0", - "@aws-cdk/aws-kinesisanalytics": "~1.66.0", - "@aws-cdk/aws-kinesisfirehose": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-lambda-event-sources": "~1.66.0", - "@aws-cdk/aws-logs": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/aws-sns": "~1.66.0", - "@aws-cdk/aws-sqs": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-kms": "~1.66.0", - "@aws-cdk/aws-events": "~1.66.0", - "@aws-cdk/aws-cognito": "~1.66.0", - "@aws-cdk/aws-elasticsearch": "~1.66.0", - "@aws-cdk/aws-cloudwatch": "~1.66.0", - "@aws-cdk/aws-stepfunctions": "~1.66.0", - "@aws-cdk/aws-cloudfront-origins": "~1.66.0" + "@aws-cdk/aws-cloudfront": "~1.67.0", + "@aws-cdk/aws-dynamodb": "~1.67.0", + "@aws-cdk/aws-iot": "~1.67.0", + "@aws-cdk/aws-kinesis": "~1.67.0", + "@aws-cdk/aws-kinesisanalytics": "~1.67.0", + "@aws-cdk/aws-kinesisfirehose": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-lambda-event-sources": "~1.67.0", + "@aws-cdk/aws-logs": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/aws-sns": "~1.67.0", + "@aws-cdk/aws-sqs": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-kms": "~1.67.0", + "@aws-cdk/aws-events": "~1.67.0", + "@aws-cdk/aws-cognito": "~1.67.0", + "@aws-cdk/aws-elasticsearch": "~1.67.0", + "@aws-cdk/aws-cloudwatch": "~1.67.0", + "@aws-cdk/aws-stepfunctions": "~1.67.0", + "@aws-cdk/aws-cloudfront-origins": "~1.67.0" } } diff --git a/source/patterns/@aws-solutions-constructs/core/test/apigateway-helper.test.ts b/source/patterns/@aws-solutions-constructs/core/test/apigateway-helper.test.ts index 9198530af..eae86a715 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/apigateway-helper.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/apigateway-helper.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/cloudfront-distribution-api-gateway-helper.test.ts b/source/patterns/@aws-solutions-constructs/core/test/cloudfront-distribution-api-gateway-helper.test.ts index 4e23dd137..2d976ace5 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/cloudfront-distribution-api-gateway-helper.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/cloudfront-distribution-api-gateway-helper.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/cloudfront-distribution-s3-helper.test.ts b/source/patterns/@aws-solutions-constructs/core/test/cloudfront-distribution-s3-helper.test.ts index 00ded7fad..eeb28ef61 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/cloudfront-distribution-s3-helper.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/cloudfront-distribution-s3-helper.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/cloudwatch-log-group.test.ts b/source/patterns/@aws-solutions-constructs/core/test/cloudwatch-log-group.test.ts index de6bf6a97..3de0ee861 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/cloudwatch-log-group.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/cloudwatch-log-group.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/congnito-helper.test.ts b/source/patterns/@aws-solutions-constructs/core/test/congnito-helper.test.ts index 57fc9712a..ecb475d4c 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/congnito-helper.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/congnito-helper.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/dynamo-table.test.ts b/source/patterns/@aws-solutions-constructs/core/test/dynamo-table.test.ts index e14eeefc0..22f1d85f4 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/dynamo-table.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/dynamo-table.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/elasticsearch-helper.test.ts b/source/patterns/@aws-solutions-constructs/core/test/elasticsearch-helper.test.ts index 79ed8ef09..8ee751209 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/elasticsearch-helper.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/elasticsearch-helper.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/events-rule.test.ts b/source/patterns/@aws-solutions-constructs/core/test/events-rule.test.ts index 0700d3af9..9813c2de1 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/events-rule.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/events-rule.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/iot-rule.test.ts b/source/patterns/@aws-solutions-constructs/core/test/iot-rule.test.ts index 6ebe9e674..647393972 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/iot-rule.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/iot-rule.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/kinesis-analytics-helper.test.ts b/source/patterns/@aws-solutions-constructs/core/test/kinesis-analytics-helper.test.ts index 9942a6439..ae3ed3fbc 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/kinesis-analytics-helper.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/kinesis-analytics-helper.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/kinesis-analytics.test.ts b/source/patterns/@aws-solutions-constructs/core/test/kinesis-analytics.test.ts index 999a7f4c2..4751605a5 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/kinesis-analytics.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/kinesis-analytics.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/kinesis-firehose-s3-defaults.test.ts b/source/patterns/@aws-solutions-constructs/core/test/kinesis-firehose-s3-defaults.test.ts index 7c4f1ed59..1c9c9edf3 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/kinesis-firehose-s3-defaults.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/kinesis-firehose-s3-defaults.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/kinesis-streams-defaults.test.ts b/source/patterns/@aws-solutions-constructs/core/test/kinesis-streams-defaults.test.ts index a0ea6a97c..fa77d5605 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/kinesis-streams-defaults.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/kinesis-streams-defaults.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/kinesis-streams-helper.test.ts b/source/patterns/@aws-solutions-constructs/core/test/kinesis-streams-helper.test.ts index 4242ed54d..180c2a5e8 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/kinesis-streams-helper.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/kinesis-streams-helper.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/kms-helper.test.ts b/source/patterns/@aws-solutions-constructs/core/test/kms-helper.test.ts index 91a3872c9..dc3b79fe9 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/kms-helper.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/kms-helper.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/lambda-event-source.test.ts b/source/patterns/@aws-solutions-constructs/core/test/lambda-event-source.test.ts index d52525f7f..aedf3fd65 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/lambda-event-source.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/lambda-event-source.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/lambda-func.test.ts b/source/patterns/@aws-solutions-constructs/core/test/lambda-func.test.ts index 55db1f8c3..cfe3e6651 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/lambda-func.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/lambda-func.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/override-warning-service.test.ts b/source/patterns/@aws-solutions-constructs/core/test/override-warning-service.test.ts index 0927998f1..f35a99b01 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/override-warning-service.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/override-warning-service.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/s3-bucket-helper.test.ts b/source/patterns/@aws-solutions-constructs/core/test/s3-bucket-helper.test.ts index 4bbec4e91..a3497ca9f 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/s3-bucket-helper.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/s3-bucket-helper.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/s3-bucket.test.ts b/source/patterns/@aws-solutions-constructs/core/test/s3-bucket.test.ts index c4fd0a208..49fe2ee5b 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/s3-bucket.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/s3-bucket.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/sns-helper.test.ts b/source/patterns/@aws-solutions-constructs/core/test/sns-helper.test.ts index 293a85da7..e1b250225 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/sns-helper.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/sns-helper.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/sqs-helper.test.ts b/source/patterns/@aws-solutions-constructs/core/test/sqs-helper.test.ts index f6ca1b10b..442a9865a 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/sqs-helper.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/sqs-helper.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/core/test/step-function-helper.test.ts b/source/patterns/@aws-solutions-constructs/core/test/step-function-helper.test.ts index f3fe8d0df..b333cfe95 100644 --- a/source/patterns/@aws-solutions-constructs/core/test/step-function-helper.test.ts +++ b/source/patterns/@aws-solutions-constructs/core/test/step-function-helper.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/patterns/@aws-solutions-constructs/license-header.js b/source/patterns/@aws-solutions-constructs/license-header.js index e3d94bb9f..610562742 100644 --- a/source/patterns/@aws-solutions-constructs/license-header.js +++ b/source/patterns/@aws-solutions-constructs/license-header.js @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/tools/cdk-integ-tools/package.json b/source/tools/cdk-integ-tools/package.json index cc1643295..066923f27 100644 --- a/source/tools/cdk-integ-tools/package.json +++ b/source/tools/cdk-integ-tools/package.json @@ -31,9 +31,9 @@ "typescript": "~3.7.4" }, "dependencies": { - "@aws-cdk/cloudformation-diff": "~1.66.0", - "@aws-cdk/cx-api": "~1.66.0", - "aws-cdk": "~1.66.0", + "@aws-cdk/cloudformation-diff": "~1.67.0", + "@aws-cdk/cx-api": "~1.67.0", + "aws-cdk": "~1.67.0", "fs-extra": "^8.1.0", "yargs": "^15.1.0" }, diff --git a/source/use_cases/aws-s3-static-website/README.md b/source/use_cases/aws-s3-static-website/README.md index 258a17b28..e1d52e435 100644 --- a/source/use_cases/aws-s3-static-website/README.md +++ b/source/use_cases/aws-s3-static-website/README.md @@ -20,4 +20,4 @@ cdk deploy After the stack is deployed successfully, go to the Outputs tab in AWS Cloudformation console, it should show the 'websiteURL', click on the link and enjoy the Wile Rydes Unicorn website. *** -© Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file +© Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file diff --git a/source/use_cases/aws-s3-static-website/bin/s3-static-site-app.ts b/source/use_cases/aws-s3-static-website/bin/s3-static-site-app.ts index 4bb90921c..45dc0ddfe 100644 --- a/source/use_cases/aws-s3-static-website/bin/s3-static-site-app.ts +++ b/source/use_cases/aws-s3-static-website/bin/s3-static-site-app.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/use_cases/aws-s3-static-website/lib/s3-static-site-stack.ts b/source/use_cases/aws-s3-static-website/lib/s3-static-site-stack.ts index 8e86ffb6b..b8cf27e09 100644 --- a/source/use_cases/aws-s3-static-website/lib/s3-static-site-stack.ts +++ b/source/use_cases/aws-s3-static-website/lib/s3-static-site-stack.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/use_cases/aws-s3-static-website/package.json b/source/use_cases/aws-s3-static-website/package.json index 9fb735d61..2613104c4 100644 --- a/source/use_cases/aws-s3-static-website/package.json +++ b/source/use_cases/aws-s3-static-website/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-s3-static-website", - "version": "1.66.0", + "version": "1.67.0", "description": "Use case pattern for deploying a S3 static website.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -28,19 +28,19 @@ "build+lint+test": "npm run build && npm run lint && npm test && npm run integ-assert" }, "dependencies": { - "@aws-solutions-constructs/aws-cloudfront-s3": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-cloudfront": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/custom-resources": "~1.66.0", - "@aws-cdk/aws-cloudformation": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-solutions-constructs/aws-cloudfront-s3": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-cloudfront": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/custom-resources": "~1.67.0", + "@aws-cdk/aws-cloudformation": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "source-map-support": "^0.5.16" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, diff --git a/source/use_cases/aws-s3-static-website/test/integ.basic-deployment.ts b/source/use_cases/aws-s3-static-website/test/integ.basic-deployment.ts index 8bb9d36a2..22444fdec 100644 --- a/source/use_cases/aws-s3-static-website/test/integ.basic-deployment.ts +++ b/source/use_cases/aws-s3-static-website/test/integ.basic-deployment.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/use_cases/aws-s3-static-website/test/s3-static-site-stack.test.ts b/source/use_cases/aws-s3-static-website/test/s3-static-site-stack.test.ts index e42365947..476f36c37 100644 --- a/source/use_cases/aws-s3-static-website/test/s3-static-site-stack.test.ts +++ b/source/use_cases/aws-s3-static-website/test/s3-static-site-stack.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/use_cases/aws-serverless-image-handler/README.md b/source/use_cases/aws-serverless-image-handler/README.md index a8097aeae..c7dfdc627 100644 --- a/source/use_cases/aws-serverless-image-handler/README.md +++ b/source/use_cases/aws-serverless-image-handler/README.md @@ -31,4 +31,4 @@ new ServerlessImageHandler(this, 'ServerlessImageHandlerPattern', { ![Architecture Diagram](architecture.png) *** -© Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file +© Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file diff --git a/source/use_cases/aws-serverless-image-handler/lib/index.ts b/source/use_cases/aws-serverless-image-handler/lib/index.ts index 28a05a344..830d8db43 100644 --- a/source/use_cases/aws-serverless-image-handler/lib/index.ts +++ b/source/use_cases/aws-serverless-image-handler/lib/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/image-handler.js b/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/image-handler.js index 49bf4b615..d3de68bae 100755 --- a/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/image-handler.js +++ b/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/image-handler.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/image-request.js b/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/image-request.js index f8224543a..e2fb709b4 100755 --- a/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/image-request.js +++ b/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/image-request.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/index.js b/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/index.js index 1f1ca8c08..d9d47f87a 100755 --- a/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/index.js +++ b/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/test/test-image-handler.js b/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/test/test-image-handler.js index a42c2a918..07ff1c057 100755 --- a/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/test/test-image-handler.js +++ b/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/test/test-image-handler.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/test/test-image-request.js b/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/test/test-image-request.js index 9507dacef..0e7b1719f 100755 --- a/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/test/test-image-request.js +++ b/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/test/test-image-request.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/test/test-thumbor-mapping.js b/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/test/test-thumbor-mapping.js index 1186bc5d3..3443f63b6 100755 --- a/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/test/test-thumbor-mapping.js +++ b/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/test/test-thumbor-mapping.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/thumbor-mapping.js b/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/thumbor-mapping.js index 4dca04f57..a38740f4a 100755 --- a/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/thumbor-mapping.js +++ b/source/use_cases/aws-serverless-image-handler/lib/lambda/image-handler/thumbor-mapping.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/use_cases/aws-serverless-image-handler/package.json b/source/use_cases/aws-serverless-image-handler/package.json index f9f774184..a507ead81 100644 --- a/source/use_cases/aws-serverless-image-handler/package.json +++ b/source/use_cases/aws-serverless-image-handler/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-serverless-image-handler", - "version": "1.66.0", + "version": "1.67.0", "description": "Use case pattern for deploying a serverless image handler API.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -53,18 +53,18 @@ } }, "dependencies": { - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-cloudfront": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-solutions-constructs/aws-cloudfront-apigateway-lambda": "~1.66.0", - "@aws-solutions-constructs/aws-lambda-s3": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0" + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-cloudfront": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-solutions-constructs/aws-cloudfront-apigateway-lambda": "~1.67.0", + "@aws-solutions-constructs/aws-lambda-s3": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, @@ -74,14 +74,14 @@ ] }, "peerDependencies": { - "@aws-solutions-constructs/aws-cloudfront-apigateway-lambda": "~1.66.0", - "@aws-solutions-constructs/aws-lambda-s3": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-cloudfront": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0" + "@aws-solutions-constructs/aws-cloudfront-apigateway-lambda": "~1.67.0", + "@aws-solutions-constructs/aws-lambda-s3": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-cloudfront": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0" } } diff --git a/source/use_cases/aws-serverless-image-handler/test/integ.basic-deployment.ts b/source/use_cases/aws-serverless-image-handler/test/integ.basic-deployment.ts index fecc86751..fa769a95e 100644 --- a/source/use_cases/aws-serverless-image-handler/test/integ.basic-deployment.ts +++ b/source/use_cases/aws-serverless-image-handler/test/integ.basic-deployment.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/use_cases/aws-serverless-image-handler/test/test.serverless-image-handler.test.ts b/source/use_cases/aws-serverless-image-handler/test/test.serverless-image-handler.test.ts index d8b1b2a13..e4c9d49c1 100644 --- a/source/use_cases/aws-serverless-image-handler/test/test.serverless-image-handler.test.ts +++ b/source/use_cases/aws-serverless-image-handler/test/test.serverless-image-handler.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/use_cases/aws-serverless-web-app/README.md b/source/use_cases/aws-serverless-web-app/README.md index f075cfca8..e75651991 100644 --- a/source/use_cases/aws-serverless-web-app/README.md +++ b/source/use_cases/aws-serverless-web-app/README.md @@ -33,4 +33,4 @@ After the stack is deployed successfully, go to the Outputs tab in AWS Cloudform *** -© Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file +© Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file diff --git a/source/use_cases/aws-serverless-web-app/bin/serverless-web-app.ts b/source/use_cases/aws-serverless-web-app/bin/serverless-web-app.ts index 4b2b4f15a..e0eba0eac 100644 --- a/source/use_cases/aws-serverless-web-app/bin/serverless-web-app.ts +++ b/source/use_cases/aws-serverless-web-app/bin/serverless-web-app.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/use_cases/aws-serverless-web-app/lib/s3-static-site-stack.ts b/source/use_cases/aws-serverless-web-app/lib/s3-static-site-stack.ts index 178b29faf..1c5b9c22b 100644 --- a/source/use_cases/aws-serverless-web-app/lib/s3-static-site-stack.ts +++ b/source/use_cases/aws-serverless-web-app/lib/s3-static-site-stack.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/use_cases/aws-serverless-web-app/lib/serverless-backend-stack.ts b/source/use_cases/aws-serverless-web-app/lib/serverless-backend-stack.ts index 2d1f70256..b65c4ff14 100644 --- a/source/use_cases/aws-serverless-web-app/lib/serverless-backend-stack.ts +++ b/source/use_cases/aws-serverless-web-app/lib/serverless-backend-stack.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/use_cases/aws-serverless-web-app/package.json b/source/use_cases/aws-serverless-web-app/package.json index 0afb9eafa..cc054af80 100644 --- a/source/use_cases/aws-serverless-web-app/package.json +++ b/source/use_cases/aws-serverless-web-app/package.json @@ -1,6 +1,6 @@ { "name": "@aws-solutions-constructs/aws-serverless-web-app", - "version": "1.66.0", + "version": "1.67.0", "description": "Use case pattern for deploying a serverless web app.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -28,24 +28,24 @@ "build+lint+test": "npm run build && npm run lint && npm test && npm run integ-assert" }, "dependencies": { - "@aws-solutions-constructs/aws-cloudfront-s3": "~1.66.0", - "@aws-solutions-constructs/aws-cognito-apigateway-lambda": "~1.66.0", - "@aws-solutions-constructs/aws-lambda-dynamodb": "~1.66.0", - "@aws-cdk/core": "~1.66.0", - "@aws-cdk/aws-lambda": "~1.66.0", - "@aws-cdk/aws-cloudfront": "~1.66.0", - "@aws-cdk/aws-s3": "~1.66.0", - "@aws-cdk/custom-resources": "~1.66.0", - "@aws-cdk/aws-cloudformation": "~1.66.0", - "@aws-cdk/aws-iam": "~1.66.0", - "@aws-cdk/aws-cognito": "~1.66.0", - "@aws-cdk/aws-apigateway": "~1.66.0", - "@aws-cdk/aws-dynamodb": "~1.66.0", - "@aws-solutions-constructs/core": "~1.66.0", + "@aws-solutions-constructs/aws-cloudfront-s3": "~1.67.0", + "@aws-solutions-constructs/aws-cognito-apigateway-lambda": "~1.67.0", + "@aws-solutions-constructs/aws-lambda-dynamodb": "~1.67.0", + "@aws-cdk/core": "~1.67.0", + "@aws-cdk/aws-lambda": "~1.67.0", + "@aws-cdk/aws-cloudfront": "~1.67.0", + "@aws-cdk/aws-s3": "~1.67.0", + "@aws-cdk/custom-resources": "~1.67.0", + "@aws-cdk/aws-cloudformation": "~1.67.0", + "@aws-cdk/aws-iam": "~1.67.0", + "@aws-cdk/aws-cognito": "~1.67.0", + "@aws-cdk/aws-apigateway": "~1.67.0", + "@aws-cdk/aws-dynamodb": "~1.67.0", + "@aws-solutions-constructs/core": "~1.67.0", "source-map-support": "^0.5.16" }, "devDependencies": { - "@aws-cdk/assert": "~1.66.0", + "@aws-cdk/assert": "~1.67.0", "@types/jest": "^24.0.23", "@types/node": "^10.3.0" }, diff --git a/source/use_cases/aws-serverless-web-app/test/integ.001-s3-static-website-deployment.ts b/source/use_cases/aws-serverless-web-app/test/integ.001-s3-static-website-deployment.ts index 6e8a10593..25b66fd6a 100644 --- a/source/use_cases/aws-serverless-web-app/test/integ.001-s3-static-website-deployment.ts +++ b/source/use_cases/aws-serverless-web-app/test/integ.001-s3-static-website-deployment.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/use_cases/aws-serverless-web-app/test/integ.002-backend-deployment.ts b/source/use_cases/aws-serverless-web-app/test/integ.002-backend-deployment.ts index 765dd43c4..b7f7aceee 100644 --- a/source/use_cases/aws-serverless-web-app/test/integ.002-backend-deployment.ts +++ b/source/use_cases/aws-serverless-web-app/test/integ.002-backend-deployment.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/use_cases/aws-serverless-web-app/test/s3-static-site-stack.test.ts b/source/use_cases/aws-serverless-web-app/test/s3-static-site-stack.test.ts index acf86147d..6856c1505 100644 --- a/source/use_cases/aws-serverless-web-app/test/s3-static-site-stack.test.ts +++ b/source/use_cases/aws-serverless-web-app/test/s3-static-site-stack.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/use_cases/aws-serverless-web-app/test/serverless-backend-stack.test.ts b/source/use_cases/aws-serverless-web-app/test/serverless-backend-stack.test.ts index c60b47ede..2b3140083 100644 --- a/source/use_cases/aws-serverless-web-app/test/serverless-backend-stack.test.ts +++ b/source/use_cases/aws-serverless-web-app/test/serverless-backend-stack.test.ts @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at diff --git a/source/use_cases/license-header.js b/source/use_cases/license-header.js index e3d94bb9f..610562742 100644 --- a/source/use_cases/license-header.js +++ b/source/use_cases/license-header.js @@ -1,5 +1,5 @@ /** - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * with the License. A copy of the License is located at