Skip to content

Commit

Permalink
Merge branch 'main' into colifran/table-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Sep 6, 2023
2 parents bb75dfb + 4ac47df commit 3df786a
Show file tree
Hide file tree
Showing 26 changed files with 768 additions and 937 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"build-all": "tsc -b"
},
"devDependencies": {
"@nx/workspace": "^16.7.4",
"@nx/workspace": "^16.8.0",
"@types/node": "18.11.19",
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
Expand All @@ -27,9 +27,9 @@
"jsii-diff": "1.88.0",
"jsii-pacmak": "1.88.0",
"jsii-reflect": "1.88.0",
"jsii-rosetta": "~5.1.11",
"jsii-rosetta": "~5.1.12",
"lerna": "^7.2.0",
"nx": "^16.7.4",
"nx": "^16.8.0",
"patch-package": "^6.5.1",
"semver": "^7.5.4",
"standard-version": "^9.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk-testing/cli-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"dependencies": {
"@octokit/rest": "^18.12.0",
"aws-sdk": "^2.1447.0",
"aws-sdk": "^2.1451.0",
"axios": "^0.27.2",
"fs-extra": "^9.1.0",
"glob": "^7.2.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk-testing/framework-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"@aws-cdk/integ-tests-alpha": "0.0.0",
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
"aws-cdk-lib": "0.0.0",
"aws-sdk": "^2.1447.0",
"aws-sdk": "^2.1451.0",
"aws-sdk-mock": "5.6.0",
"cdk8s": "^2.64.0",
"cdk8s": "^2.64.5",
"cdk8s-plus-24": "2.12.1",
"constructs": "^10.0.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"name": "eks-service-account-sdk-call-integ-test",
"private": "true",
"dependencies": {
"aws-sdk": "^2.1447.0"
"aws-sdk": "^2.1451.0"
}
}
6 changes: 3 additions & 3 deletions packages/@aws-cdk/aws-amplify-alpha/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/integ-runner": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@aws-sdk/client-amplify": "^3.398.0",
"@aws-sdk/client-s3": "^3.400.0",
"@aws-sdk/s3-request-presigner": "^3.400.0",
"@aws-sdk/client-amplify": "^3.405.0",
"@aws-sdk/client-s3": "^3.405.0",
"@aws-sdk/s3-request-presigner": "^3.405.0",
"@types/jest": "^29.5.4",
"aws-cdk-lib": "0.0.0",
"constructs": "^10.0.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/aws-redshift-alpha/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/integ-runner": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@aws-sdk/client-redshift": "^3.398.0",
"@aws-sdk/client-redshift-data": "^3.398.0",
"@aws-sdk/client-secrets-manager": "^3.398.0",
"@aws-sdk/client-redshift": "^3.405.0",
"@aws-sdk/client-redshift-data": "^3.405.0",
"@aws-sdk/client-secrets-manager": "^3.405.0",
"@types/jest": "^29.5.4",
"aws-cdk-lib": "0.0.0",
"constructs": "^10.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cloudformation-diff/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^29.5.4",
"@types/string-width": "^4.0.1",
"fast-check": "^3.12.0",
"fast-check": "^3.12.1",
"jest": "^29.6.4",
"ts-jest": "^29.1.1"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/@aws-cdk/custom-resource-handlers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@aws-cdk/sdk-v2-to-v3-adapter": "0.0.0",
"@aws-sdk/client-ecs": "^3.400.0",
"@aws-sdk/client-ecs": "^3.406.0",
"@types/jest": "^29.5.4",
"aws-sdk-client-mock": "^3.0.0",
"aws-sdk-client-mock-jest": "^3.0.0",
"jest": "^29.6.4",
"esbuild": "^0.19.2"
},
"dependencies": {
"@aws-sdk/client-lambda": "^3.398.0",
"@aws-sdk/client-synthetics": "^3.398.0",
"@aws-sdk/client-ecr": "^3.398.0",
"@aws-sdk/client-s3": "^3.400.0"
"@aws-sdk/client-lambda": "^3.405.0",
"@aws-sdk/client-synthetics": "^3.405.0",
"@aws-sdk/client-ecr": "^3.405.0",
"@aws-sdk/client-s3": "^3.405.0"
},
"repository": {
"url": "https://github.com/aws/aws-cdk.git",
Expand Down
34 changes: 30 additions & 4 deletions packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,32 @@ OTHER DEALINGS IN THE SOFTWARE.

----------------

** archiver-utils@3.0.4 - https://www.npmjs.com/package/archiver-utils/v/3.0.4 | MIT
Copyright (c) 2015 Chris Talkington.

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

----------------

** archiver@5.3.2 - https://www.npmjs.com/package/archiver/v/5.3.2 | MIT
Copyright (c) 2012-2014 Chris Talkington, contributors.

Expand Down Expand Up @@ -176,7 +202,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE

----------------

** aws-sdk@2.1447.0 - https://www.npmjs.com/package/aws-sdk/v/2.1447.0 | Apache-2.0
** aws-sdk@2.1451.0 - https://www.npmjs.com/package/aws-sdk/v/2.1451.0 | Apache-2.0
AWS SDK for JavaScript
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Expand Down Expand Up @@ -407,7 +433,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

----------------

** compress-commons@4.1.1 - https://www.npmjs.com/package/compress-commons/v/4.1.1 | MIT
** compress-commons@4.1.2 - https://www.npmjs.com/package/compress-commons/v/4.1.2 | MIT
Copyright (c) 2014 Chris Talkington, contributors.

Permission is hereby granted, free of charge, to any person
Expand Down Expand Up @@ -686,7 +712,7 @@ IN THE SOFTWARE.

----------------

** crc32-stream@4.0.2 - https://www.npmjs.com/package/crc32-stream/v/4.0.2 | MIT
** crc32-stream@4.0.3 - https://www.npmjs.com/package/crc32-stream/v/4.0.3 | MIT
Copyright (c) 2014 Chris Talkington, contributors.

Permission is hereby granted, free of charge, to any person
Expand Down Expand Up @@ -2938,7 +2964,7 @@ THE SOFTWARE.

----------------

** zip-stream@4.1.0 - https://www.npmjs.com/package/zip-stream/v/4.1.0 | MIT
** zip-stream@4.1.1 - https://www.npmjs.com/package/zip-stream/v/4.1.1 | MIT
Copyright (c) 2014 Chris Talkington, contributors.

Permission is hereby granted, free of charge, to any person
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/integ-tests-alpha/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@
"@aws-cdk/integ-runner": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@aws-cdk/sdk-v2-to-v3-adapter": "0.0.0",
"@aws-sdk/client-ec2": "^3.399.0",
"@aws-sdk/client-s3": "^3.400.0",
"@aws-sdk/client-sfn": "^3.398.0",
"@aws-sdk/client-ec2": "^3.406.0",
"@aws-sdk/client-s3": "^3.405.0",
"@aws-sdk/client-sfn": "^3.405.0",
"@aws-sdk/types": "^3.398.0",
"@types/fs-extra": "^9.0.13",
"@types/jest": "^29.5.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/sdk-v2-to-v3-adapter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"devDependencies": {
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@aws-sdk/client-s3": "^3.400.0",
"@aws-sdk/client-s3": "^3.405.0",
"@types/jest": "^29.5.4",
"jest": "^29.6.4"
},
Expand Down
1 change: 1 addition & 0 deletions packages/aws-cdk-lib/aws-ec2/lib/vpc-endpoint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,7 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
public static readonly XRAY = new InterfaceVpcEndpointAwsService('xray');
public static readonly SECURITYHUB = new InterfaceVpcEndpointAwsService('securityhub');
public static readonly EMAIL_SMTP = new InterfaceVpcEndpointAwsService('email-smtp');
public static readonly VERIFIED_PERMISSIONS = new InterfaceVpcEndpointAwsService('verifiedpermissions');

/**
* The name of the service. e.g. com.amazonaws.us-east-1.ecs
Expand Down
40 changes: 20 additions & 20 deletions packages/aws-cdk-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,37 +146,37 @@
"@aws-cdk/pkglint": "0.0.0",
"@aws-cdk/sdk-v2-to-v3-adapter": "0.0.0",
"@aws-cdk/spec2cdk": "0.0.0",
"@aws-sdk/client-acm": "^3.398.0",
"@aws-sdk/client-account": "^3.398.0",
"@aws-sdk/client-codepipeline": "^3.398.0",
"@aws-sdk/client-cloudwatch-logs": "^3.398.0",
"@aws-sdk/client-dynamodb": "^3.398.0",
"@aws-sdk/client-ec2": "^3.399.0",
"@aws-sdk/client-ecr": "^3.398.0",
"@aws-sdk/client-eks": "^3.398.0",
"@aws-sdk/client-iam": "^3.398.0",
"@aws-sdk/client-lambda": "^3.398.0",
"@aws-sdk/client-route-53": "^3.398.0",
"@aws-sdk/client-s3": "^3.400.0",
"@aws-sdk/client-sfn": "^3.398.0",
"@aws-sdk/client-ssm": "^3.398.0",
"@aws-sdk/client-sts": "^3.398.0",
"@aws-sdk/credential-providers": "^3.398.0",
"@aws-sdk/client-acm": "^3.405.0",
"@aws-sdk/client-account": "^3.405.0",
"@aws-sdk/client-codepipeline": "^3.405.0",
"@aws-sdk/client-cloudwatch-logs": "^3.405.0",
"@aws-sdk/client-dynamodb": "^3.405.0",
"@aws-sdk/client-ec2": "^3.406.0",
"@aws-sdk/client-ecr": "^3.405.0",
"@aws-sdk/client-eks": "^3.405.0",
"@aws-sdk/client-iam": "^3.405.0",
"@aws-sdk/client-lambda": "^3.405.0",
"@aws-sdk/client-route-53": "^3.405.0",
"@aws-sdk/client-s3": "^3.405.0",
"@aws-sdk/client-sfn": "^3.405.0",
"@aws-sdk/client-ssm": "^3.405.0",
"@aws-sdk/client-sts": "^3.405.0",
"@aws-sdk/credential-providers": "^3.405.0",
"@aws-sdk/node-http-handler": "^3.370.0",
"@aws-sdk/types": "^3.398.0",
"@types/aws-lambda": "^8.10.119",
"@types/jest": "^29.5.4",
"@types/lodash": "^4.14.197",
"@types/lodash": "^4.14.198",
"@types/punycode": "^2.1.0",
"aws-sdk": "^2.1447.0",
"aws-sdk": "^2.1451.0",
"aws-sdk-client-mock": "^3.0.0",
"aws-sdk-client-mock-jest": "^3.0.0",
"aws-sdk-mock": "5.8.0",
"cdk8s": "^2.64.0",
"cdk8s": "^2.64.5",
"constructs": "^10.0.0",
"delay": "5.0.0",
"esbuild": "^0.19.2",
"fast-check": "^3.12.0",
"fast-check": "^3.12.1",
"fs-extra": "^11.1.1",
"jest": "^29.6.4",
"jest-each": "^29.6.3",
Expand Down
42 changes: 34 additions & 8 deletions packages/aws-cdk/THIRD_PARTY_LICENSES
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,32 @@ OTHER DEALINGS IN THE SOFTWARE.

----------------

** archiver-utils@3.0.4 - https://www.npmjs.com/package/archiver-utils/v/3.0.4 | MIT
Copyright (c) 2015 Chris Talkington.

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

----------------

** archiver@5.3.2 - https://www.npmjs.com/package/archiver/v/5.3.2 | MIT
Copyright (c) 2012-2014 Chris Talkington, contributors.

Expand Down Expand Up @@ -238,7 +264,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE

----------------

** aws-sdk@2.1447.0 - https://www.npmjs.com/package/aws-sdk/v/2.1447.0 | Apache-2.0
** aws-sdk@2.1451.0 - https://www.npmjs.com/package/aws-sdk/v/2.1451.0 | Apache-2.0
AWS SDK for JavaScript
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Expand Down Expand Up @@ -532,7 +558,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

----------------

** compress-commons@4.1.1 - https://www.npmjs.com/package/compress-commons/v/4.1.1 | MIT
** compress-commons@4.1.2 - https://www.npmjs.com/package/compress-commons/v/4.1.2 | MIT
Copyright (c) 2014 Chris Talkington, contributors.

Permission is hereby granted, free of charge, to any person
Expand Down Expand Up @@ -811,7 +837,7 @@ IN THE SOFTWARE.

----------------

** crc32-stream@4.0.2 - https://www.npmjs.com/package/crc32-stream/v/4.0.2 | MIT
** crc32-stream@4.0.3 - https://www.npmjs.com/package/crc32-stream/v/4.0.3 | MIT
Copyright (c) 2014 Chris Talkington, contributors.

Permission is hereby granted, free of charge, to any person
Expand Down Expand Up @@ -1367,7 +1393,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

----------------

** https-proxy-agent@7.0.1 - https://www.npmjs.com/package/https-proxy-agent/v/7.0.1 | MIT
** https-proxy-agent@7.0.2 - https://www.npmjs.com/package/https-proxy-agent/v/7.0.2 | MIT

----------------

Expand Down Expand Up @@ -2134,7 +2160,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

----------------

** pac-proxy-agent@7.0.0 - https://www.npmjs.com/package/pac-proxy-agent/v/7.0.0 | MIT
** pac-proxy-agent@7.0.1 - https://www.npmjs.com/package/pac-proxy-agent/v/7.0.1 | MIT

----------------

Expand Down Expand Up @@ -2224,7 +2250,7 @@ THE SOFTWARE.

----------------

** proxy-agent@6.3.0 - https://www.npmjs.com/package/proxy-agent/v/6.3.0 | MIT
** proxy-agent@6.3.1 - https://www.npmjs.com/package/proxy-agent/v/6.3.1 | MIT

----------------

Expand Down Expand Up @@ -2793,7 +2819,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

----------------

** socks-proxy-agent@8.0.1 - https://www.npmjs.com/package/socks-proxy-agent/v/8.0.1 | MIT
** socks-proxy-agent@8.0.2 - https://www.npmjs.com/package/socks-proxy-agent/v/8.0.2 | MIT

----------------

Expand Down Expand Up @@ -3375,7 +3401,7 @@ THE SOFTWARE.

----------------

** zip-stream@4.1.0 - https://www.npmjs.com/package/zip-stream/v/4.1.0 | MIT
** zip-stream@4.1.1 - https://www.npmjs.com/package/zip-stream/v/4.1.1 | MIT
Copyright (c) 2014 Chris Talkington, contributors.

Permission is hereby granted, free of charge, to any person
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"devDependencies": {
"@types/jest": "^29.5.4",
"@types/node": "20.5.7",
"@types/node": "20.5.9",
"jest": "^29.6.4",
"ts-jest": "^29.1.1",
"aws-cdk": "%cdk-version%",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@types/jest": "^29.5.4",
"@types/node": "20.5.7",
"@types/node": "20.5.9",
"aws-cdk-lib": "%cdk-version%",
"constructs": "%constructs-version%",
"jest": "^29.6.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"devDependencies": {
"@types/jest": "^29.5.4",
"@types/node": "20.5.7",
"@types/node": "20.5.9",
"jest": "^29.6.4",
"ts-jest": "^29.1.1",
"aws-cdk": "%cdk-version%",
Expand Down
Loading

0 comments on commit 3df786a

Please sign in to comment.