Merge branch 'main' into aws-iot-s3

.viperlightignore

@@ -140,4 +140,8 @@ source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.depl
 source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingEventBus.expected.json:108
 source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/integ.existingFunction.expected.json:122
 source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/aws-lambda-eventbridge.test.ts:28
-source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/aws-lambda-eventbridge.test.ts:339
+source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/test/aws-lambda-eventbridge.test.ts:339
+# These are references to the us-east-1 ELBV2 account (publicly known)
+source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApi.expected.json:193
+source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPrivateApiExistingZone.expected.json:844
+source/patterns/@aws-solutions-constructs/aws-route53-alb/test/integ.deployPublicApiNewAlb.expected.json:188

CHANGELOG.v2.md

@@ -0,0 +1,56 @@
+# Changelog
+
+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.0.0-rc.1 (2021-10-12)
+
+### Added
+This is the first release candidate of Solutions Constructs 2.0 based on CDK v2.0 🎉
+- aws-apigateway-dynamodb
+- aws-apigateway-iot
+- aws-apigateway-kinesisstreams
+- aws-apigateway-lambda
+- aws-apigateway-sagemakerendpoint
+- aws-apigateway-sqs
+- aws-cloudfront-apigateway
+- aws-cloudfront-apigateway-lambda
+- aws-cloudfront-mediastore
+- aws-cloudfront-s3
+- aws-cognito-apigateway-lambda
+- aws-dynamodbstreams-lambda
+- aws-dynamodbstreams-lambda-elasticsearch-kibana
+- aws-eventbridge-kinesisfirehose-s3
+- aws-eventbridge-kinesisstreams
+- aws-eventbridge-lambda
+- aws-eventbridge-sns
+- aws-eventbridge-sqs
+- aws-eventbridge-stepfunctions
+- aws-iot-kinesisfirehose-s3
+- aws-iot-kinesisstreams
+- aws-iot-lambda
+- aws-iot-lambda-dynamodb
+- aws-iot-sqs
+- aws-kinesisfirehose-s3
+- aws-kinesisfirehose-s3-and-kinesisanalytics
+- aws-kinesisstreams-gluejob
+- aws-kinesisstreams-kinesisfirehose-s3
+- aws-kinesisstreams-lambda
+- aws-lambda-dynamodb
+- aws-lambda-elasticsearch-kibana
+- aws-lambda-eventbridge
+- aws-lambda-s3
+- aws-lambda-sagemakerendpoint
+- aws-lambda-secretsmanager
+- aws-lambda-sns
+- aws-lambda-sqs
+- aws-lambda-sqs-lambda
+- aws-lambda-ssmstringparameter
+- aws-lambda-stepfunctions
+- aws-s3-lambda
+- aws-s3-sqs
+- aws-s3-stepfunctions
+- aws-sns-lambda
+- aws-sns-sqs
+- aws-sqs-lambda
+- aws-wafwebacl-apigateway
+- aws-wafwebacl-cloudfront

sonar-project.properties

@@ -22,50 +22,65 @@ sonar.exclusions=\
 #    source/test/coverage-reports/jest/*/lcov.info
 # so we have to provide an explicit list of reportPaths
 sonar.javascript.lcov.reportPaths= \
-    source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-apigateway-iot/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-sns-sqs/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-s3-lambda/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-lambda-sqs/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/core/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-lambda-s3/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-lambda-sns/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-events-rule-sns/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-events-rule-kinesisstreams/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-sns-lambda/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-iot-lambda/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-events-rule-kinesisfirehose-s3/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-sqs-lambda/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-s3-step-function/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-lambda-step-function/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-s3-sqs/coverage/lcov.info, \
-    source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/coverage/lcov.info, \
+    source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-apigateway-iot/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-cloudfront-mediastore/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-events-rule-kinesisfirehose-s3/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-events-rule-kinesisstreams/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-events-rule-sns/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-iot-kinesisstreams/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-iot-lambda/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-iot-sqs/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-kinesisstreams-kinesisfirehose-s3/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-kinesisstreams-lambda/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-lambda-eventbridge/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-lambda-s3/coverage/lcov.info \
     source/patterns/@aws-solutions-constructs/aws-lambda-sagemakerendpoint/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-lambda-sns/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-lambda-sqs/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/coverage/lcov.info \
     source/patterns/@aws-solutions-constructs/aws-lambda-ssmstringparameter/coverage/lcov.info \
-    source/patterns/@aws-solutions-constructs/aws-lambda-secretsmanager/coverage/lcov.info
+    source/patterns/@aws-solutions-constructs/aws-lambda-step-function/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-route53-alb/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-s3-lambda/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-s3-sqs/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-s3-step-function/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-s3-stepfunctions/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-sns-lambda/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-sns-sqs/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-sqs-lambda/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/coverage/lcov.info \
+    source/patterns/@aws-solutions-constructs/aws-wafwebacl-cloudfront/coverage/lcov.info
 
 # Encoding of the source files
 sonar.sourceEncoding=UTF-8

source/lerna.v2.json

@@ -6,5 +6,5 @@
     "./patterns/@aws-solutions-constructs/*"
   ],
   "rejectCycles": "true",
-  "version": "2.0.0-rc.0"
+  "version": "2.0.0-rc.1"
 }

source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/README.md

@@ -71,7 +71,7 @@ _Parameters_
 |apiGateway|[`api.RestApi`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-apigateway.RestApi.html)|Returns an instance of the api.RestApi created by the construct.|
 |apiGatewayRole|[`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 API Gateway.|
 |dynamoTable|[`dynamodb.Table`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-dynamodb.Table.html)|Returns an instance of dynamodb.Table created by the construct.|
-|apiGatewayCloudWatchRole|[`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 API Gateway for CloudWatch access.|
+|apiGatewayCloudWatchRole?|[`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 API Gateway for CloudWatch access.|
 |apiGatewayLogGroup|[`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 API Gateway access logging to CloudWatch.|
 
 ## Default settings

source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/lib/index.ts

@@ -109,7 +109,7 @@ export class ApiGatewayToDynamoDB extends Construct {
   public readonly dynamoTable: dynamodb.Table;
   public readonly apiGatewayRole: iam.Role;
   public readonly apiGateway: api.RestApi;
-  public readonly apiGatewayCloudWatchRole: iam.Role;
+  public readonly apiGatewayCloudWatchRole?: iam.Role;
   public readonly apiGatewayLogGroup: logs.LogGroup;
   /**
    * @summary Constructs a new instance of the ApiGatewayToDynamoDB class.

source/patterns/@aws-solutions-constructs/aws-apigateway-iot/README.md

@@ -69,7 +69,7 @@ _Parameters_
 |:-------------|:----------------|-----------------|
 |apiGateway|[`api.RestApi`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-apigateway.RestApi.html)|Returns an instance of the API Gateway REST API created by the pattern.|
 |apiGatewayRole|[`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 API Gateway.|
-|apiGatewayCloudWatchRole|[`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 API Gateway for CloudWatch access.|
+|apiGatewayCloudWatchRole?|[`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 API Gateway for CloudWatch access.|
 |apiGatewayLogGroup|[`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 API Gateway access logging to CloudWatch.|
 
 ## Default settings

source/patterns/@aws-solutions-constructs/aws-apigateway-iot/lib/index.ts

@@ -61,7 +61,7 @@ export interface ApiGatewayToIotProps {
  */
 export class ApiGatewayToIot extends Construct {
   public readonly apiGateway: api.RestApi;
-  public readonly apiGatewayCloudWatchRole: iam.Role;
+  public readonly apiGatewayCloudWatchRole?: iam.Role;
   public readonly apiGatewayLogGroup: logs.LogGroup;
   public readonly apiGatewayRole: iam.IRole;
   private readonly iotEndpoint: string;

source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/README.md

@@ -5,10 +5,6 @@
 
 ![Stability: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)
 
-> All classes are under active development and subject to non-backward compatible changes or removal in any
-> future version. These are not subject to the [Semantic Versioning](https://semver.org/) model.
-> This means that while you may use them, you may need to update your source code when upgrading to a newer version of this package.
-
 ---
 <!--END STABILITY BANNER-->
 
@@ -67,7 +63,7 @@ _Parameters_
 |:-------------|:----------------|-----------------|
 |apiGateway|[`api.RestApi`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-apigateway.RestApi.html)|Returns an instance of the API Gateway REST API created by the pattern.|
 |apiGatewayRole|[`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 API Gateway.|
-|apiGatewayCloudWatchRole|[`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 API Gateway for CloudWatch access.|
+|apiGatewayCloudWatchRole?|[`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 API Gateway for CloudWatch access.|
 |apiGatewayLogGroup|[`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 API Gateway access logging to CloudWatch.|
 |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 or used by the pattern.|
 |cloudwatchAlarms?|[`cloudwatch.Alarm[]`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudwatch.Alarm.html)|Returns an array of recommended CloudWatch Alarms created by the construct for Kinesis Data stream|

source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/lib/index.ts

@@ -96,7 +96,7 @@ export interface ApiGatewayToKinesisStreamsProps {
 export class ApiGatewayToKinesisStreams extends Construct {
   public readonly apiGateway: api.RestApi;
   public readonly apiGatewayRole: iam.Role;
-  public readonly apiGatewayCloudWatchRole: iam.Role;
+  public readonly apiGatewayCloudWatchRole?: iam.Role;
   public readonly apiGatewayLogGroup: logs.LogGroup;
   public readonly kinesisStream: kinesis.Stream;
   public readonly cloudwatchAlarms?: cloudwatch.Alarm[];