Merge branch 'Issue351' of github.com:awslabs/aws-solutions-constructs into Issue351

Update local.

Author: biffgaut

deployment/v2/align-version.js

@@ -32,6 +32,7 @@ for (const file of process.argv.splice(4)) {
   pkg.devDependencies = processDevDependencies(pkg.devDependencies || { }, file);
   if (pkg.scripts) {
     pkg.scripts["integ-assert"] = "cdk-integ-assert-v2";
+    pkg.scripts["jsii-pacmak"] = "jsii-pacmak --targets js java python";
   }
 
   console.error(`${file} => ${replaceVersion}`);
@@ -43,9 +44,12 @@ function processDependencies(section, file) {
   let newdependencies = {};
   for (const [ name, version ] of Object.entries(section)) {
     // Remove all entries starting with @aws-cdk/* and constructs
-    if (MODULE_EXEMPTIONS.has(name) || ((!name.startsWith('@aws-cdk/') && !name.startsWith('constructs')))) {
+    if ((!name.startsWith('@aws-cdk/') && !name.startsWith('constructs'))) {
       newdependencies[name] = version.replace(findVersion, replaceVersion);
     }
+    if (MODULE_EXEMPTIONS.has(name)) {
+      newdependencies[name] = version.replace(findVersion, awsCdkLibVersion);
+    }
   }
   return newdependencies;
 }
@@ -54,23 +58,30 @@ function processPeerDependencies(section, file) {
   let newdependencies = {};
   for (const [ name, version ] of Object.entries(section)) {
     // Remove all entries starting with @aws-cdk/* and constructs
-    if (MODULE_EXEMPTIONS.has(name) || ((!name.startsWith('@aws-cdk/') && !name.startsWith('constructs')))) {
+    if ((!name.startsWith('@aws-cdk/') && !name.startsWith('constructs'))) {
       newdependencies[name] = version.replace(findVersion, replaceVersion);
     }
+    if (MODULE_EXEMPTIONS.has(name)) {
+      newdependencies[name] = version.replace(findVersion, awsCdkLibVersion);
+    }
   }
   newdependencies["aws-cdk-lib"] = `^${awsCdkLibVersion}`;
   newdependencies["constructs"] = `^${constructsVersion}`;
   return newdependencies;
 }
 
 function processDevDependencies(section, file) {
-  let newdependencies = section;
-  for (const [ name, version ] of Object.entries(newdependencies)) {
+  let newdependencies = {};
+  for (const [ name, version ] of Object.entries(section)) {
     // Remove all entries starting with @aws-cdk/* and constructs
-    if (version === findVersion || version === '^' + findVersion) {
+    if ((!name.startsWith('@aws-cdk/') && !name.startsWith('constructs'))) {
       newdependencies[name] = version.replace(findVersion, replaceVersion);
     }
+    if (MODULE_EXEMPTIONS.has(name)) {
+      newdependencies[name] = version.replace(findVersion, awsCdkLibVersion);
+    }
   }
+
   // note: no ^ to make sure we test against the minimum version
   newdependencies["aws-cdk-lib"] = `${awsCdkLibVersion}`;
   newdependencies["constructs"] = `^${constructsVersion}`;

deployment/v2/build-cdk-dist.sh

@@ -2,8 +2,8 @@
 set -euo pipefail
 
 deployment_dir=$(cd $(dirname $0) && pwd)
-source_dir="$deployment_dir/../source"
-dist_dir="$deployment_dir/dist"
+source_dir="$deployment_dir/../../source"
+dist_dir="$deployment_dir/../dist"
 
 cd $source_dir/
 export PATH=$(npm bin):$PATH
@@ -73,7 +73,7 @@ cat > ${dist_dir}/build.json <<HERE
 HERE
 
 # copy CHANGELOG.md to dist/ for github releases
-changelog_file=$deployment_dir/../CHANGELOG.md
+changelog_file=$deployment_dir/../../CHANGELOG.v2.md
 cp ${changelog_file} ${dist_dir}/CHANGELOG.md
 
 echo "------------------------------------------------------------------------------"

source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/package.json

@@ -66,8 +66,7 @@
   "devDependencies": {
     "@aws-cdk/assert": "0.0.0",
     "@types/jest": "^26.0.22",
-    "@types/node": "^10.3.0",
-    "aws-cdk": "0.0.0"
+    "@types/node": "^10.3.0"
   },
   "jest": {
     "moduleFileExtensions": [

source/patterns/@aws-solutions-constructs/aws-lambda-s3/README.md

@@ -52,14 +52,15 @@ _Parameters_
 | **Name**     | **Type**        | **Description** |
 |:-------------|:----------------|-----------------|
 |existingLambdaObj?|[`lambda.Function`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.Function.html)|Existing instance of Lambda Function object, providing both this and `lambdaFunctionProps` will cause an error.|
-|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.|
+|lambdaFunctionProps?|[`lambda.FunctionProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-lambda.FunctionProps.html)|Optional user provided props to override the default props for the Lambda function.|
 |existingBucketObj?|[`s3.IBucket`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.IBucket.html)|Existing instance of S3 Bucket object. If this is provided, then also providing bucketProps is an error. |
-|bucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|User provided props to override the default props for the S3 Bucket.|
+|bucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|Optional user provided props to override the default props for the S3 Bucket.|
 |bucketPermissions?|`string[]`|Optional bucket permissions to grant to the Lambda function. One or more of the following may be specified: `Delete`, `Put`, `Read`, `ReadWrite`, `Write`.|
 |existingVpc?|[`ec2.IVpc`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-ec2.IVpc.html)|An optional, existing VPC into which this pattern should be deployed. When deployed in a VPC, the Lambda function will use ENIs in the VPC to access network resources and an Interface Endpoint will be created in the VPC for Amazon SQS. If an existing VPC is provided, the `deployVpc` property cannot be `true`. This uses `ec2.IVpc` to allow clients to supply VPCs that exist outside the stack using the [`ec2.Vpc.fromLookup()`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-ec2.Vpc.html#static-fromwbrlookupscope-id-options) method.|
-|vpcProps?|[`ec2.VpcProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-ec2.VpcProps.html)|Optional user-provided properties to override the default properties for the new VPC. `enableDnsHostnames`, `enableDnsSupport`, `natGateways` and `subnetConfiguration` are set by the pattern, so any values for those properties supplied here will be overrriden. If `deployVpc` is not `true` then this property will be ignored.|
+|vpcProps?|[`ec2.VpcProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-ec2.VpcProps.html)|Optional user provided properties to override the default properties for the new VPC. `enableDnsHostnames`, `enableDnsSupport`, `natGateways` and `subnetConfiguration` are set by the pattern, so any values for those properties supplied here will be overrriden. If `deployVpc` is not `true` then this property will be ignored.|
 |deployVpc?|`boolean`|Whether to create a new VPC based on `vpcProps` into which to deploy this pattern. Setting this to true will deploy the minimal, most private VPC to run the pattern:<ul><li> One isolated subnet in each Availability Zone used by the CDK program</li><li>`enableDnsHostnames` and `enableDnsSupport` will both be set to true</li></ul>If this property is `true` then `existingVpc` cannot be specified. Defaults to `false`.|
-|bucketEnvironmentVariableName?|`string`|Optional Name for the S3 bucket environment variable set for the Lambda function.|
+|bucketEnvironmentVariableName?|`string`|Optional name for the S3 bucket environment variable set for the Lambda function.|
+|loggingBucketProps?|[`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-s3.BucketProps.html)|Optional user provided props to override the default props for the S3 Logging Bucket.|
 
 ## Pattern Properties
 

source/patterns/@aws-solutions-constructs/aws-lambda-s3/lib/index.ts

@@ -30,7 +30,7 @@ export interface LambdaToS3Props {
    */
   readonly existingLambdaObj?: lambda.Function;
   /**
-   * User provided props to override the default props for the Lambda function.
+   * Optional user provided props to override the default props for the Lambda function.
    *
    * @default - Default properties are used.
    */
@@ -42,7 +42,7 @@ export interface LambdaToS3Props {
    */
   readonly existingBucketObj?: s3.IBucket;
   /**
-   * User provided props to override the default props for the S3 Bucket.
+   * Optional user provided props to override the default props for the S3 Bucket.
    *
    * @default - Default props are used
    */
@@ -69,11 +69,17 @@ export interface LambdaToS3Props {
    */
   readonly deployVpc?: boolean;
   /**
-   * Optional Name for the S3 bucket environment variable set for the Lambda function.
+   * Optional name for the S3 bucket environment variable set for the Lambda function.
    *
    * @default - None
    */
   readonly bucketEnvironmentVariableName?: string;
+  /**
+   * Optional user provided props to override the default props for the S3 Logging Bucket.
+   *
+   * @default - Default props are used
+   */
+   readonly loggingBucketProps?: s3.BucketProps
 }
 
 /**
@@ -131,7 +137,8 @@ export class LambdaToS3 extends Construct {
       // Setup S3 Bucket
       if (!props.existingBucketObj) {
         [this.s3Bucket, this.s3LoggingBucket] = defaults.buildS3Bucket(this, {
-          bucketProps: props.bucketProps
+          bucketProps: props.bucketProps,
+          loggingBucketProps: props.loggingBucketProps
         });
         bucket = this.s3Bucket;
       } else {