Skip to content

Commit

Permalink
Merge branch 'master' into api_key_websocket
Browse files Browse the repository at this point in the history
  • Loading branch information
@mergify
mergify[bot] authored Jan 11, 2022
2 parents 9a429fa + beb5706 commit 5632f9a
Show file tree
Hide file tree
Showing 262 changed files with 1,257 additions and 1,042 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"cdk-generate-synthetic-examples": "^0.1.1",
"conventional-changelog-cli": "^2.2.2",
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.8",
"graceful-fs": "^4.2.9",
"jest-junit": "^13.0.0",
"jsii-diff": "^1.50.0",
"jsii-pacmak": "^1.50.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk-containers/ecs-service-extensions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^27.0.3",
"@types/jest": "^27.4.0",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/aws-autoscaling": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"jest": "^27.4.5",
"jest": "^27.4.7",
"@aws-cdk/pkglint": "0.0.0",
"@aws-cdk/assert-internal": "0.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/alexa-ask/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/app-delivery/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3",
"@types/jest": "^27.4.0",
"fast-check": "^2.20.0",
"jest": "^27.4.5"
"jest": "^27.4.7"
},
"repository": {
"type": "git",
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/assert-internal/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"devDependencies": {
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3",
"jest": "^27.4.5",
"@types/jest": "^27.4.0",
"jest": "^27.4.7",
"ts-jest": "^27.1.2"
},
"dependencies": {
Expand All @@ -40,7 +40,7 @@
"peerDependencies": {
"@aws-cdk/core": "0.0.0",
"constructs": "^3.3.69",
"jest": "^27.4.5"
"jest": "^27.4.7"
},
"repository": {
"url": "https://github.com/aws/aws-cdk.git",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@aws-cdk/assert-internal": "0.0.0",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3",
"@types/jest": "^27.4.0",
"aws-cdk-migration": "0.0.0",
"constructs": "^3.3.69",
"jest": "^27.3.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/assertions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/fs-extra": "^9.0.13",
"@types/jest": "^27.0.3",
"@types/jest": "^27.4.0",
"constructs": "^3.3.69",
"jest": "^27.4.5",
"jest": "^27.4.7",
"ts-jest": "^27.1.2"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/assets/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3",
"@types/jest": "^27.4.0",
"@types/sinon": "^9.0.11",
"aws-cdk": "0.0.0",
"jest": "^27.4.5",
"jest": "^27.4.7",
"sinon": "^9.2.4",
"ts-mock-imports": "^1.3.8"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-accessanalyzer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-acmpca/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-amazonmq/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-amplify/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3",
"@types/jest": "^27.4.0",
"@types/yaml": "1.9.6",
"aws-sdk": "^2.848.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/aws-certificatemanager": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigatewayv2-authorizers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/aws-lambda": "^8.10.89",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/aws-apigatewayv2": "0.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/aws-apigatewayv2-authorizers/test/http/integ.iam.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
]
}
},
"UserAccess": {
"UserAccessEC42ADF7": {
"Type": "AWS::IAM::AccessKey",
"Properties": {
"UserName": {
Expand Down Expand Up @@ -184,13 +184,13 @@
},
"TESTACCESSKEYID": {
"Value": {
"Ref": "UserAccess"
"Ref": "UserAccessEC42ADF7"
}
},
"TESTSECRETACCESSKEY": {
"Value": {
"Fn::GetAtt": [
"UserAccess",
"UserAccessEC42ADF7",
"SecretAccessKey"
]
}
Expand Down
8 changes: 4 additions & 4 deletions packages/@aws-cdk/aws-apigatewayv2-authorizers/test/http/integ.iam.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ class ExampleComIntegration extends apigatewayv2.HttpRouteIntegration {
const app = new cdk.App();
const stack = new cdk.Stack(app, 'IntegApiGatewayV2Iam');
const user = new iam.User(stack, 'User');
const userAccessKey = new iam.CfnAccessKey(stack, 'UserAccess', {
userName: user.userName,
const userAccessKey = new iam.AccessKey(stack, 'UserAccess', {
user,
});

const httpApi = new apigatewayv2.HttpApi(stack, 'HttpApi', {
Expand All @@ -44,11 +44,11 @@ new cdk.CfnOutput(stack, 'API', {
});

new cdk.CfnOutput(stack, 'TESTACCESSKEYID', {
value: userAccessKey.ref,
value: userAccessKey.accessKeyId,
});

new cdk.CfnOutput(stack, 'TESTSECRETACCESSKEY', {
value: userAccessKey.attrSecretAccessKey,
value: userAccessKey.secretAccessKey.toString(),
});

new cdk.CfnOutput(stack, 'TESTREGION', {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigatewayv2-integrations/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/aws-apigatewayv2": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigatewayv2/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/aws-certificatemanager": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-appconfig/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-appflow/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-appintegrations/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-applicationautoscaling/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3",
"@types/jest": "^27.4.0",
"fast-check": "^2.20.0",
"jest": "^27.4.5"
"jest": "^27.4.7"
},
"dependencies": {
"@aws-cdk/aws-autoscaling-common": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-applicationinsights/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-appmesh/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3",
"jest": "^27.4.5"
"@types/jest": "^27.4.0",
"jest": "^27.4.7"
},
"dependencies": {
"@aws-cdk/aws-acmpca": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apprunner/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/aws-ecr": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-appstream/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-appsync/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3",
"jest": "^27.4.5"
"@types/jest": "^27.4.0",
"jest": "^27.4.7"
},
"dependencies": {
"@aws-cdk/aws-cognito": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-aps/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-athena/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3",
"jest": "^27.4.5"
"@types/jest": "^27.4.0",
"jest": "^27.4.7"
},
"dependencies": {
"@aws-cdk/core": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-auditmanager/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-autoscaling-common/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3",
"@types/jest": "^27.4.0",
"fast-check": "^2.20.0",
"jest": "^27.4.5"
"jest": "^27.4.7"
},
"dependencies": {
"@aws-cdk/aws-iam": "0.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-autoscaling-hooktargets/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3",
"jest": "^27.4.5"
"@types/jest": "^27.4.0",
"jest": "^27.4.7"
},
"dependencies": {
"@aws-cdk/aws-autoscaling": "0.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-autoscaling/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
"@aws-cdk/cloud-assembly-schema": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3",
"jest": "^27.4.5"
"@types/jest": "^27.4.0",
"jest": "^27.4.7"
},
"dependencies": {
"@aws-cdk/aws-autoscaling-common": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-autoscalingplans/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/core": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-backup/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.0.3"
"@types/jest": "^27.4.0"
},
"dependencies": {
"@aws-cdk/aws-dynamodb": "0.0.0",
Expand Down
Loading

0 comments on commit 5632f9a

Please sign in to comment.