Skip to content

Commit

Permalink
Merge branch 'master' into feat/policy-document-parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
mbonig authored Mar 11, 2020
2 parents 76e0272 + 37144fb commit 15d6242
Show file tree
Hide file tree
Showing 22 changed files with 85 additions and 135 deletions.
1 change: 1 addition & 0 deletions allowed-breaking-changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ incompatible-argument:@aws-cdk/aws-apigateway.ProxyResource.addProxy
incompatible-argument:@aws-cdk/aws-apigateway.Resource.addProxy
incompatible-argument:@aws-cdk/aws-apigateway.ResourceBase.addProxy
incompatible-argument:@aws-cdk/aws-apigateway.IResource.addProxy
incompatible-argument:@aws-cdk/aws-apigateway.RequestAuthorizer.<initializer>
incompatible-argument:@aws-cdk/aws-servicediscovery.Service.fromServiceAttributes
removed:@aws-cdk/core.ConstructNode.addReference
removed:@aws-cdk/core.ConstructNode.references
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"devDependencies": {
"conventional-changelog-cli": "^2.0.31",
"fs-extra": "^8.1.0",
"jsii-diff": "^1.0.0",
"jsii-diff": "^1.1.0",
"jsii-pacmak": "^0.22.0",
"jsii-rosetta": "^0.22.0",
"lerna": "^3.20.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"cdk-integ-tools": "0.0.0",
"nodeunit": "^0.11.3",
"pkglint": "0.0.0",
"sinon": "^9.0.0",
"sinon": "^9.0.1",
"ts-mock-imports": "^1.2.6"
},
"dependencies": {
Expand Down
3 changes: 1 addition & 2 deletions packages/@aws-cdk/aws-apigateway/lib/authorizers/lambda.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { Construct, Duration, Lazy, Stack } from '@aws-cdk/core';
import { CfnAuthorizer } from '../apigateway.generated';
import { Authorizer, IAuthorizer } from '../authorizer';
import { RestApi } from '../restapi';
import { IdentitySource } from './identity-source';

/**
* Base properties for all lambda authorizers
Expand Down Expand Up @@ -190,7 +189,7 @@ export interface RequestAuthorizerProps extends LambdaAuthorizerProps {
*
* @see https://docs.aws.amazon.com/apigateway/api-reference/link-relation/authorizer-create/#identitySource
*/
readonly identitySources: IdentitySource[];
readonly identitySources: string[];
}

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-cloudfront/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"devDependencies": {
"@aws-cdk/assert": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.636.0",
"aws-sdk": "^2.637.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-cloudtrail/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"devDependencies": {
"@aws-cdk/assert": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.636.0",
"aws-sdk": "^2.637.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-codebuild/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@aws-cdk/aws-sns": "0.0.0",
"@aws-cdk/aws-sqs": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.636.0",
"aws-sdk": "^2.637.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-codecommit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@aws-cdk/assert": "0.0.0",
"@aws-cdk/aws-sns": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.636.0",
"aws-sdk": "^2.637.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/aws-dynamodb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@
"devDependencies": {
"@aws-cdk/assert": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.636.0",
"aws-sdk-mock": "^5.0.0",
"aws-sdk": "^2.637.0",
"aws-sdk-mock": "^5.1.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
"nodeunit": "^0.11.3",
"pkglint": "0.0.0",
"sinon": "^9.0.0"
"sinon": "^9.0.1"
},
"dependencies": {
"@aws-cdk/aws-applicationautoscaling": "0.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-eks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@
"devDependencies": {
"@aws-cdk/assert": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.636.0",
"aws-sdk": "^2.637.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
"nodeunit": "^0.11.3",
"pkglint": "0.0.0",
"sinon": "^9.0.0"
"sinon": "^9.0.1"
},
"dependencies": {
"@aws-cdk/aws-autoscaling": "0.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-events-targets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
"devDependencies": {
"@aws-cdk/assert": "0.0.0",
"@aws-cdk/aws-codecommit": "0.0.0",
"aws-sdk": "^2.636.0",
"aws-sdk-mock": "^5.0.0",
"aws-sdk": "^2.637.0",
"aws-sdk-mock": "^5.1.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"jest": "^24.9.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/aws-lambda/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,16 @@
"@types/lodash": "^4.14.149",
"@types/nodeunit": "^0.0.30",
"@types/sinon": "^7.5.2",
"aws-sdk": "^2.636.0",
"aws-sdk-mock": "^5.0.0",
"aws-sdk": "^2.637.0",
"aws-sdk-mock": "^5.1.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
"lodash": "^4.17.15",
"nock": "^12.0.2",
"nodeunit": "^0.11.3",
"pkglint": "0.0.0",
"sinon": "^9.0.0"
"sinon": "^9.0.1"
},
"dependencies": {
"@aws-cdk/aws-cloudwatch": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-route53/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"devDependencies": {
"@aws-cdk/assert": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.636.0",
"aws-sdk": "^2.637.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-s3-assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"cdk-integ-tools": "0.0.0",
"nodeunit": "^0.11.3",
"pkglint": "0.0.0",
"sinon": "^9.0.0",
"sinon": "^9.0.1",
"ts-mock-imports": "^1.2.6"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-sqs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"@aws-cdk/assert": "0.0.0",
"@aws-cdk/aws-s3": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.636.0",
"aws-sdk": "^2.637.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/custom-resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@
"@types/aws-lambda": "^8.10.39",
"@types/fs-extra": "^8.1.0",
"@types/sinon": "^7.5.2",
"aws-sdk": "^2.636.0",
"aws-sdk-mock": "^5.0.0",
"aws-sdk": "^2.637.0",
"aws-sdk-mock": "^5.1.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
"fs-extra": "^8.1.0",
"nock": "^12.0.2",
"pkglint": "0.0.0",
"sinon": "^9.0.0"
"sinon": "^9.0.1"
},
"dependencies": {
"@aws-cdk/aws-cloudformation": "0.0.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/aws-cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,21 @@
"@types/uuid": "^7.0.0",
"@types/yaml": "^1.2.0",
"@types/yargs": "^15.0.4",
"aws-sdk-mock": "^5.0.0",
"aws-sdk-mock": "^5.1.0",
"cdk-build-tools": "0.0.0",
"jest": "^24.9.0",
"jszip": "^3.2.2",
"mockery": "^2.1.0",
"pkglint": "0.0.0",
"sinon": "^9.0.0",
"sinon": "^9.0.1",
"ts-jest": "^25.2.0"
},
"dependencies": {
"@aws-cdk/cloudformation-diff": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/region-info": "0.0.0",
"archiver": "^3.1.1",
"aws-sdk": "^2.636.0",
"aws-sdk": "^2.637.0",
"camelcase": "^5.3.1",
"colors": "^1.4.0",
"decamelize": "^4.0.0",
Expand All @@ -86,7 +86,7 @@
"source-map-support": "^0.5.16",
"table": "^5.4.6",
"uuid": "^7.0.2",
"yaml": "^1.8.0",
"yaml": "^1.8.2",
"yargs": "^15.3.0"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cdk-assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"dependencies": {
"@aws-cdk/cdk-assets-schema": "0.0.0",
"archiver": "^3.1.1",
"aws-sdk": "^2.636.0",
"aws-sdk": "^2.637.0",
"glob": "^7.1.6",
"yargs": "^15.3.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/cdk-dasm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
},
"license": "Apache-2.0",
"dependencies": {
"codemaker": "^1.0.0",
"yaml": "1.8.0"
"codemaker": "^1.1.0",
"yaml": "1.8.2"
},
"devDependencies": {
"@types/jest": "^25.1.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/decdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
"fs-extra": "^8.1.0",
"jsii-reflect": "^1.0.0",
"jsonschema": "^1.2.5",
"yaml": "1.8.0",
"yaml": "1.8.2",
"yargs": "^15.3.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion tools/cfn2ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"license": "Apache-2.0",
"dependencies": {
"@aws-cdk/cfnspec": "0.0.0",
"codemaker": "^1.0.0",
"codemaker": "^1.1.0",
"fast-json-patch": "^3.0.0-1",
"fs-extra": "^8.1.0",
"yargs": "^15.3.0"
Expand Down
Loading

0 comments on commit 15d6242

Please sign in to comment.