chore(merge-back): 2.30.0

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.30.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.29.0...v2.30.0) (2022-12-28)
+
+Built on CDK 2.57.0
+
+### Features
+
+* **aws-lambda-kinesisstream:** created new construct  ([#873](https://github.com/awslabs/aws-solutions-constructs/issues/873)) ([81592de](https://github.com/awslabs/aws-solutions-constructs/commit/81592de3b14a9d6f01a7e61519be6c6b90695cff))
+* **new construct:** aws-fargate-kinesisfirehose ([#881](https://github.com/awslabs/aws-solutions-constructs/issues/881)) ([3a74a27](https://github.com/awslabs/aws-solutions-constructs/commit/3a74a27f9c3e895a44b485ee1bb8fe9adc50a80e))
+* **new construct:** aws-fargate-kinesisstreams ([#877](https://github.com/awslabs/aws-solutions-constructs/issues/877)) ([08b7975](https://github.com/awslabs/aws-solutions-constructs/commit/08b79756743e4a3f9930128e8318670666e01367)), closes [#875](https://github.com/awslabs/aws-solutions-constructs/issues/875)
+* **new construct:** aws-lambda-kinesisfirehose ([#875](https://github.com/awslabs/aws-solutions-constructs/issues/875)) ([aef3efa](https://github.com/awslabs/aws-solutions-constructs/commit/aef3efab4b4658f12ed82937683d08997162d9bc))
+
 ## [2.29.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.28.0...v2.29.0) (2022-12-04)
 
 ### Features

deployment/v2/align-version.js

@@ -10,7 +10,7 @@ const findVersion = process.argv[2];
 const replaceVersion = process.argv[3];
 
 // these versions need to be sourced from a config file
-const awsCdkLibVersion = '2.53.0';
+const awsCdkLibVersion = '2.57.0';
 const constructsVersion = '10.0.0';
 const MODULE_EXEMPTIONS = new Set([
   '@aws-cdk/cloudformation-diff',

source/lerna.json

@@ -6,5 +6,5 @@
     "./patterns/@aws-solutions-constructs/*"
   ],
   "rejectCycles": "true",
-  "version": "2.29.0"
+  "version": "2.30.0"
 }

source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-existing-eventbus.expected.json

@@ -483,6 +483,9 @@
       "ap-south-1": {
         "states": "states.ap-south-1.amazonaws.com"
       },
+      "ap-south-2": {
+        "states": "states.ap-south-2.amazonaws.com"
+      },
       "ap-southeast-1": {
         "states": "states.ap-southeast-1.amazonaws.com"
       },

source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-new-eventbus.expected.json

@@ -483,6 +483,9 @@
       "ap-south-1": {
         "states": "states.ap-south-1.amazonaws.com"
       },
+      "ap-south-2": {
+        "states": "states.ap-south-2.amazonaws.com"
+      },
       "ap-southeast-1": {
         "states": "states.ap-southeast-1.amazonaws.com"
       },

source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-no-argument.expected.json

@@ -288,6 +288,9 @@
       "ap-south-1": {
         "states": "states.ap-south-1.amazonaws.com"
       },
+      "ap-south-2": {
+        "states": "states.ap-south-2.amazonaws.com"
+      },
       "ap-southeast-1": {
         "states": "states.ap-southeast-1.amazonaws.com"
       },

source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-with-lambda.expected.json

@@ -470,6 +470,9 @@
       "ap-south-1": {
         "states": "states.ap-south-1.amazonaws.com"
       },
+      "ap-south-2": {
+        "states": "states.ap-south-2.amazonaws.com"
+      },
       "ap-southeast-1": {
         "states": "states.ap-southeast-1.amazonaws.com"
       },

source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-defaultprops.expected.json

@@ -25,9 +25,6 @@
             }
           ]
         },
-        "LoggingConfiguration": {
-          "LogFilePrefix": "logs"
-        },
         "PublicAccessBlockConfiguration": {
           "BlockPublicAcls": true,
           "BlockPublicPolicy": true,
@@ -39,7 +36,17 @@
         }
       },
       "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete"
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "cfn_nag": {
+          "rules_to_suppress": [
+            {
+              "id": "W35",
+              "reason": "This S3 bucket is created for unit/ integration testing purposes only."
+            }
+          ]
+        }
+      }
     },
     "testiots3integrationS3BucketPolicy18905375": {
       "Type": "AWS::S3::BucketPolicy",

source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-defaultprops.ts

@@ -15,6 +15,7 @@
 import { App, RemovalPolicy, Stack } from "aws-cdk-lib";
 import { IotToS3, IotToS3Props } from "../lib";
 import { generateIntegStackName } from '@aws-solutions-constructs/core';
+import * as defaults from '@aws-solutions-constructs/core';
 
 const app = new App();
 const stack = new Stack(app, generateIntegStackName(__filename));
@@ -31,8 +32,14 @@ const props: IotToS3Props = {
   logS3AccessLogs: false,
   bucketProps: {
     removalPolicy: RemovalPolicy.DESTROY,
-    serverAccessLogsPrefix: 'logs'
   }
 };
-new IotToS3(stack, 'test-iot-s3-integration', props);
+
+const testConstruct = new IotToS3(stack, 'test-iot-s3-integration', props);
+
+defaults.addCfnSuppressRules(testConstruct.s3Bucket!, [
+  { id: 'W35',
+    reason: 'This S3 bucket is created for unit/ integration testing purposes only.' },
+]);
+
 app.synth();

source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-existing-bucket.expected.json

@@ -25,9 +25,6 @@
             }
           ]
         },
-        "LoggingConfiguration": {
-          "LogFilePrefix": "logs"
-        },
         "PublicAccessBlockConfiguration": {
           "BlockPublicAcls": true,
           "BlockPublicPolicy": true,
@@ -39,7 +36,17 @@
         }
       },
       "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete"
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "cfn_nag": {
+          "rules_to_suppress": [
+            {
+              "id": "W35",
+              "reason": "This S3 bucket is created for unit/ integration testing purposes only."
+            }
+          ]
+        }
+      }
     },
     "S3BucketPolicyF560589A": {
       "Type": "AWS::S3::BucketPolicy",

source/patterns/@aws-solutions-constructs/aws-iot-s3/test/integ.iot-s3-existing-bucket.ts

@@ -27,7 +27,6 @@ let existingBucketObj;
   bucketProps: {
     removalPolicy: RemovalPolicy.DESTROY,
     encryption: BucketEncryption.KMS_MANAGED,
-    serverAccessLogsPrefix: 'logs'
   },
   logS3AccessLogs: false
 });
@@ -44,6 +43,11 @@ const props: IotToS3Props = {
   s3Key: 'test/${timestamp()}'
 };
 
+defaults.addCfnSuppressRules(existingBucketObj, [
+  { id: 'W35',
+    reason: 'This S3 bucket is created for unit/ integration testing purposes only.' },
+]);
+
 new IotToS3(stack, 'test-iot-s3-integration', props);
 
 app.synth();

source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existingStreamObj.expected.json

@@ -91,7 +91,8 @@
                 "kinesis:ListShards",
                 "kinesis:SubscribeToShard",
                 "kinesis:DescribeStream",
-                "kinesis:ListStreams"
+                "kinesis:ListStreams",
+                "kinesis:DescribeStreamConsumer"
               ],
               "Effect": "Allow",
               "Resource": {

source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.existing.expected.json

@@ -69,7 +69,8 @@
                 "kinesis:ListShards",
                 "kinesis:SubscribeToShard",
                 "kinesis:DescribeStream",
-                "kinesis:ListStreams"
+                "kinesis:ListStreams",
+                "kinesis:DescribeStreamConsumer"
               ],
               "Effect": "Allow",
               "Resource": {

source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/test/integ.no-arguments.expected.json

@@ -91,7 +91,8 @@
                 "kinesis:ListShards",
                 "kinesis:SubscribeToShard",
                 "kinesis:DescribeStream",
-                "kinesis:ListStreams"
+                "kinesis:ListStreams",
+                "kinesis:DescribeStreamConsumer"
               ],
               "Effect": "Allow",
               "Resource": {

source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deploy-lambda.expected.json

@@ -375,6 +375,9 @@
       "ap-south-1": {
         "states": "states.ap-south-1.amazonaws.com"
       },
+      "ap-south-2": {
+        "states": "states.ap-south-2.amazonaws.com"
+      },
       "ap-southeast-1": {
         "states": "states.ap-southeast-1.amazonaws.com"
       },

source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.deployFunctionWithVpc.expected.json

@@ -818,6 +818,9 @@
       "ap-south-1": {
         "states": "states.ap-south-1.amazonaws.com"
       },
+      "ap-south-2": {
+        "states": "states.ap-south-2.amazonaws.com"
+      },
       "ap-southeast-1": {
         "states": "states.ap-southeast-1.amazonaws.com"
       },

source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/integ.existing-function.expected.json

@@ -375,6 +375,9 @@
       "ap-south-1": {
         "states": "states.ap-south-1.amazonaws.com"
       },
+      "ap-south-2": {
+        "states": "states.ap-south-2.amazonaws.com"
+      },
       "ap-southeast-1": {
         "states": "states.ap-southeast-1.amazonaws.com"
       },

source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.existing-s3-bucket.expected.json

@@ -306,7 +306,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-s3-lambda/test/integ.no-arguments.expected.json

@@ -364,7 +364,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.customLoggingBucket.expected.json

@@ -443,7 +443,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingS3Bucket.expected.json

@@ -307,7 +307,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingSnsTopic.expected.json

@@ -443,7 +443,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.existingUnencryptedSnsTopic.expected.json

@@ -329,7 +329,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.newTopicFromProps.expected.json

@@ -444,7 +444,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.noArguments.expected.json

@@ -443,7 +443,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.s3EventTypesAndFilters.expected.json

@@ -457,7 +457,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-s3-sns/test/integ.snsTopicWithAwsManagedKey.expected.json

@@ -410,7 +410,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.creatingNewQueue.expected.json

@@ -491,7 +491,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.customLoggingBucket.expected.json

@@ -553,7 +553,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingQueue.expected.json

@@ -386,7 +386,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.existingS3Bucket.expected.json

@@ -552,7 +552,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/integ.noArguments.expected.json

@@ -552,7 +552,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [

source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/test/integ.customLoggingBucket.expected.json

@@ -551,7 +551,7 @@
             "Arn"
           ]
         },
-        "Runtime": "python3.7",
+        "Runtime": "python3.9",
         "Timeout": 300
       },
       "DependsOn": [
@@ -598,6 +598,9 @@
       "ap-south-1": {
         "states": "states.ap-south-1.amazonaws.com"
       },
+      "ap-south-2": {
+        "states": "states.ap-south-2.amazonaws.com"
+      },
       "ap-southeast-1": {
         "states": "states.ap-southeast-1.amazonaws.com"
       },