Skip to content

Commit

Permalink
Update to version v1.60.0
Browse files Browse the repository at this point in the history
  • Loading branch information
hnishar committed Aug 24, 2020
1 parent 71e4c03 commit 3777df1
Show file tree
Hide file tree
Showing 44 changed files with 652 additions and 554 deletions.
6 changes: 6 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Each line is a file pattern followed by one or more owners.

# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
# @hnishar will be requested for review when someone opens a pull request.
* @hnishar
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# VSCode extension
.vscode/
/.favorites.json

# TypeScript incremental build states
*.tsbuildinfo

# Local state files & OS specifics
.DS_Store
node_modules/
source/**/package-lock.json

# CDK Context & Staging files
cdk.context.json
.cdk.staging/
cdk.out/
*.tabl.json

source/patterns/**/tsconfig.json
deployment/dist/*
.DS_Store

*.pptx
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ 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.60.0] - 2020-08-24

### Changed
- Upgraded all patterns to CDK v1.60.0

## [1.59.0] - 2020-08-19

### Changed
Expand Down
66 changes: 66 additions & 0 deletions deployment/build-cdk-dist.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
#!/bin/bash
set -euo pipefail

deployment_dir="$PWD"
source_dir="$deployment_dir/../source"
dist_dir="$deployment_dir/dist"

cd $source_dir/
export PATH=$(npm bin):$PATH
export NODE_OPTIONS="--max-old-space-size=4096 ${NODE_OPTIONS:-}"

echo "============================================================================================="
echo "packaging..."
time lerna run --bail --stream jsii-pacmak || fail
cd $deployment_dir/

echo "------------------------------------------------------------------------------"
echo "[Copy] CDK templates for all patterns into the deployment dir for CfnNagScan"
echo "------------------------------------------------------------------------------"

echo "mkdir -p $dist_dir"
mkdir -p $dist_dir

for subdir in $source_dir/patterns/\@aws-solutions-constructs/* ; do
if [ -d "$subdir" -a `basename $subdir` != "node_modules" ]; then
cd $subdir/test

echo "Checking integ CFN templates in $subdir/test"
cnt=`find . -name "*expected.json" -type f | wc -l`
prefix=`basename $subdir`
if [ "$prefix" != "core" ]
then
if [ "$cnt" -eq "0" ]
then
echo "************** [ERROR] ************* Did not find any integ CFN templates in $subdir; please add atleast one by writing an integ test case and running cdk-integ command to generate the CFN template for it"
exit 1
fi
fi

echo "Copying templates from $subdir/test"
for i in `find . -name "*expected.json" -type f`; do
prefix=`basename $subdir`
suffix=`basename $i`
cp $subdir/test/$i $dist_dir/$prefix-$suffix.template
done
cd $source_dir
fi
done

echo "------------------------------------------------------------------------------"
echo "[Copy] packages for all patterns into the deployment dir"
echo "------------------------------------------------------------------------------"

echo "mkdir -p $dist_dir"
mkdir -p $dist_dir

for dir in $(find $source_dir/patterns/\@aws-solutions-constructs/ -name dist | grep -v node_modules | grep -v coverage); do
echo "Merging ${dir} into ${dist_dir}" >&2
rsync -a $dir/ ${dist_dir}/
done

echo "------------------------------------------------------------------------------"
echo "[List] deployment/dist contents"
echo "------------------------------------------------------------------------------"

find $dist_dir
2 changes: 1 addition & 1 deletion source/lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"./patterns/@aws-solutions-constructs/*"
],
"rejectCycles": "true",
"version": "1.59.0"
"version": "1.60.0"
}
2 changes: 1 addition & 1 deletion source/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-solutions-constructs",
"version": "1.59.0",
"version": "1.60.0",
"description": "AWS Solutions Constructs Library",
"repository": {
"type": "git",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-solutions-constructs/aws-apigateway-dynamodb",
"version": "1.59.0",
"version": "1.60.0",
"description": "CDK Constructs for AWS API Gateway and Amazon DynamoDB integration.",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down Expand Up @@ -53,16 +53,16 @@
}
},
"dependencies": {
"@aws-cdk/core": "~1.59.0",
"@aws-cdk/aws-apigateway": "~1.59.0",
"@aws-cdk/aws-iam": "~1.59.0",
"@aws-cdk/aws-dynamodb": "~1.59.0",
"@aws-cdk/aws-logs": "~1.59.0",
"@aws-solutions-constructs/core": "~1.59.0",
"@aws-cdk/core": "~1.60.0",
"@aws-cdk/aws-apigateway": "~1.60.0",
"@aws-cdk/aws-iam": "~1.60.0",
"@aws-cdk/aws-dynamodb": "~1.60.0",
"@aws-cdk/aws-logs": "~1.60.0",
"@aws-solutions-constructs/core": "~1.60.0",
"constructs": "^3.0.2"
},
"devDependencies": {
"@aws-cdk/assert": "~1.59.0",
"@aws-cdk/assert": "~1.60.0",
"@types/jest": "^24.0.23",
"@types/node": "^10.3.0"
},
Expand All @@ -72,12 +72,12 @@
]
},
"peerDependencies": {
"@aws-cdk/core": "~1.59.0",
"@aws-cdk/aws-apigateway": "~1.59.0",
"@aws-cdk/aws-iam": "~1.59.0",
"@aws-cdk/aws-dynamodb": "~1.59.0",
"@aws-solutions-constructs/core": "~1.59.0",
"@aws-cdk/core": "~1.60.0",
"@aws-cdk/aws-apigateway": "~1.60.0",
"@aws-cdk/aws-iam": "~1.60.0",
"@aws-cdk/aws-dynamodb": "~1.60.0",
"@aws-solutions-constructs/core": "~1.60.0",
"constructs": "^3.0.2",
"@aws-cdk/aws-logs": "~1.59.0"
"@aws-cdk/aws-logs": "~1.60.0"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-solutions-constructs/aws-apigateway-lambda",
"version": "1.59.0",
"version": "1.60.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",
Expand Down Expand Up @@ -53,16 +53,16 @@
}
},
"dependencies": {
"@aws-cdk/aws-apigateway": "~1.59.0",
"@aws-cdk/aws-lambda": "~1.59.0",
"@aws-cdk/aws-logs": "~1.59.0",
"@aws-cdk/core": "~1.59.0",
"@aws-cdk/aws-iam": "~1.59.0",
"@aws-solutions-constructs/core": "~1.59.0",
"@aws-cdk/aws-apigateway": "~1.60.0",
"@aws-cdk/aws-lambda": "~1.60.0",
"@aws-cdk/aws-logs": "~1.60.0",
"@aws-cdk/core": "~1.60.0",
"@aws-cdk/aws-iam": "~1.60.0",
"@aws-solutions-constructs/core": "~1.60.0",
"constructs": "^3.0.2"
},
"devDependencies": {
"@aws-cdk/assert": "~1.59.0",
"@aws-cdk/assert": "~1.60.0",
"@types/jest": "^24.0.23",
"@types/node": "^10.3.0"
},
Expand All @@ -72,12 +72,12 @@
]
},
"peerDependencies": {
"@aws-cdk/aws-apigateway": "~1.59.0",
"@aws-cdk/aws-lambda": "~1.59.0",
"@aws-cdk/aws-logs": "~1.59.0",
"@aws-cdk/core": "~1.59.0",
"@aws-solutions-constructs/core": "~1.59.0",
"@aws-cdk/aws-apigateway": "~1.60.0",
"@aws-cdk/aws-lambda": "~1.60.0",
"@aws-cdk/aws-logs": "~1.60.0",
"@aws-cdk/core": "~1.60.0",
"@aws-solutions-constructs/core": "~1.60.0",
"constructs": "^3.0.2",
"@aws-cdk/aws-iam": "~1.59.0"
"@aws-cdk/aws-iam": "~1.60.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,16 @@ test('Test with lambdaFunctionProps', () => {
description: "sampleApiProp"
}
};
const app = new ApiGatewayToLambda(stack, 'test-apigateway-lambda', props);
// Assertion 1
expect(app.lambdaFunction).toHaveProperty('environment.OVERRIDE_STATUS', 'true');
new ApiGatewayToLambda(stack, 'test-apigateway-lambda', props);

expect(stack).toHaveResource('AWS::Lambda::Function', {
Environment: {
Variables: {
OVERRIDE_STATUS: "true",
AWS_NODEJS_CONNECTION_REUSE_ENABLED: "1"
}
}
});
});

// --------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-solutions-constructs/aws-apigateway-sqs",
"version": "1.59.0",
"version": "1.60.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",
Expand Down Expand Up @@ -53,17 +53,17 @@
}
},
"dependencies": {
"@aws-cdk/aws-apigateway": "~1.59.0",
"@aws-cdk/aws-sqs": "~1.59.0",
"@aws-cdk/aws-kms": "~1.59.0",
"@aws-cdk/aws-iam": "~1.59.0",
"@aws-cdk/aws-logs": "~1.59.0",
"@aws-cdk/core": "~1.59.0",
"@aws-solutions-constructs/core": "~1.59.0",
"@aws-cdk/aws-apigateway": "~1.60.0",
"@aws-cdk/aws-sqs": "~1.60.0",
"@aws-cdk/aws-kms": "~1.60.0",
"@aws-cdk/aws-iam": "~1.60.0",
"@aws-cdk/aws-logs": "~1.60.0",
"@aws-cdk/core": "~1.60.0",
"@aws-solutions-constructs/core": "~1.60.0",
"constructs": "^3.0.2"
},
"devDependencies": {
"@aws-cdk/assert": "~1.59.0",
"@aws-cdk/assert": "~1.60.0",
"@types/jest": "^24.0.23",
"@types/node": "^10.3.0"
},
Expand All @@ -73,13 +73,13 @@
]
},
"peerDependencies": {
"@aws-cdk/aws-apigateway": "~1.59.0",
"@aws-cdk/aws-sqs": "~1.59.0",
"@aws-cdk/aws-kms": "~1.59.0",
"@aws-cdk/aws-iam": "~1.59.0",
"@aws-cdk/core": "~1.59.0",
"@aws-solutions-constructs/core": "~1.59.0",
"@aws-cdk/aws-apigateway": "~1.60.0",
"@aws-cdk/aws-sqs": "~1.60.0",
"@aws-cdk/aws-kms": "~1.60.0",
"@aws-cdk/aws-iam": "~1.60.0",
"@aws-cdk/core": "~1.60.0",
"@aws-solutions-constructs/core": "~1.60.0",
"constructs": "^3.0.2",
"@aws-cdk/aws-logs": "~1.59.0"
"@aws-cdk/aws-logs": "~1.60.0"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-solutions-constructs/aws-cloudfront-apigateway-lambda",
"version": "1.59.0",
"version": "1.60.0",
"description": "CDK Constructs for AWS Cloudfront to AWS API Gateway to AWS Lambda integration.",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down Expand Up @@ -53,19 +53,19 @@
}
},
"dependencies": {
"@aws-cdk/core": "~1.59.0",
"@aws-cdk/aws-cloudfront": "~1.59.0",
"@aws-cdk/aws-apigateway": "~1.59.0",
"@aws-cdk/aws-lambda": "~1.59.0",
"@aws-cdk/aws-logs": "~1.59.0",
"@aws-cdk/aws-s3": "~1.59.0",
"@aws-cdk/aws-iam": "~1.59.0",
"@aws-solutions-constructs/aws-cloudfront-apigateway": "~1.59.0",
"@aws-solutions-constructs/core": "~1.59.0",
"@aws-cdk/core": "~1.60.0",
"@aws-cdk/aws-cloudfront": "~1.60.0",
"@aws-cdk/aws-apigateway": "~1.60.0",
"@aws-cdk/aws-lambda": "~1.60.0",
"@aws-cdk/aws-logs": "~1.60.0",
"@aws-cdk/aws-s3": "~1.60.0",
"@aws-cdk/aws-iam": "~1.60.0",
"@aws-solutions-constructs/aws-cloudfront-apigateway": "~1.60.0",
"@aws-solutions-constructs/core": "~1.60.0",
"constructs": "^3.0.2"
},
"devDependencies": {
"@aws-cdk/assert": "~1.59.0",
"@aws-cdk/assert": "~1.60.0",
"@types/jest": "^24.0.23",
"@types/node": "^10.3.0"
},
Expand All @@ -75,15 +75,15 @@
]
},
"peerDependencies": {
"@aws-cdk/core": "~1.59.0",
"@aws-cdk/aws-cloudfront": "~1.59.0",
"@aws-cdk/aws-apigateway": "~1.59.0",
"@aws-solutions-constructs/core": "~1.59.0",
"@aws-cdk/aws-lambda": "~1.59.0",
"@aws-cdk/aws-logs": "~1.59.0",
"@aws-solutions-constructs/aws-cloudfront-apigateway": "~1.59.0",
"@aws-cdk/core": "~1.60.0",
"@aws-cdk/aws-cloudfront": "~1.60.0",
"@aws-cdk/aws-apigateway": "~1.60.0",
"@aws-solutions-constructs/core": "~1.60.0",
"@aws-cdk/aws-lambda": "~1.60.0",
"@aws-cdk/aws-logs": "~1.60.0",
"@aws-solutions-constructs/aws-cloudfront-apigateway": "~1.60.0",
"constructs": "^3.0.2",
"@aws-cdk/aws-s3": "~1.59.0",
"@aws-cdk/aws-iam": "~1.59.0"
"@aws-cdk/aws-s3": "~1.60.0",
"@aws-cdk/aws-iam": "~1.60.0"
}
}
Loading

0 comments on commit 3777df1

Please sign in to comment.