Skip to content

Commit

Permalink
build(deps): bump aws-cdk-lib from 2.68.0 to 2.80.0 (#12830)
Browse files Browse the repository at this point in the history
* build(deps): bump aws-cdk-lib from 2.68.0 to 2.80.0

Bumps [aws-cdk-lib](https://github.com/aws/aws-cdk/tree/HEAD/packages/aws-cdk-lib) from 2.68.0 to 2.80.0.
- [Release notes](https://github.com/aws/aws-cdk/releases)
- [Changelog](https://github.com/aws/aws-cdk/blob/main/CHANGELOG.v2.md)
- [Commits](https://github.com/aws/aws-cdk/commits/v2.80.0/packages/aws-cdk-lib)

---
updated-dependencies:
- dependency-name: aws-cdk-lib
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: update yarn.lock

* add resolution aws-cdk-lib 2.80.0

* Revert "add resolution aws-cdk-lib 2.80.0"

This reverts commit ed0b887.

* chore: update data dependencies

* chore: update e2e tests for mock utility (#12925)

* chore: bump data package dependencies

* fix: add permissions boundary for IAM Role created for auth trigger (#12914)

* ci: fix commit hash missing on codebuild (#12959)

* chore: upgrade amplify-category-custom to aws-cdk-lib@2.28

* fix: yarn.lock

* fix: redo versions after resolving merge conflicts

* fix: temporary fix cdk version bump

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: MJ ☂️ <zhamujun@amazon.com>
Co-authored-by: Al Harris <91494052+alharris-at@users.noreply.github.com>
Co-authored-by: Al Harris <alharris@amazon.com>
Co-authored-by: Amplifiyer <51211245+Amplifiyer@users.noreply.github.com>
Co-authored-by: awsluja <110861985+awsluja@users.noreply.github.com>
Co-authored-by: MJ ☂️ <o.6180339@gmail.com>
  • Loading branch information
7 people authored Jul 21, 2023
1 parent d4f4f65 commit 8815aff
Show file tree
Hide file tree
Showing 27 changed files with 482 additions and 464 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"test-changed": "lerna run test --since dev",
"test-ci": "lerna run test --concurrency 4 -- --ci -i",
"test": "lerna run test --concurrency 1",
"update-data-packages": "./scripts/update-data-dependencies.sh && yarn",
"update-data-packages": "./scripts/update-data-dependencies.sh && yarn && yarn dedupe",
"update-test-timing-data": "ts-node ./scripts/cci-get-job-metrics.ts && ts-node ./scripts/cci-extract-test-timings-from-job-metrics.ts",
"update-versions": "lerna version --yes --no-commit-hooks --no-push --exact --conventional-commits --no-git-tag-version",
"verdaccio-clean": "rimraf ../verdaccio-cache",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-category-auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@aws-amplify/cli-extensibility-helper": "3.0.10",
"amplify-headless-interface": "1.17.4",
"amplify-util-headless-input": "1.9.13",
"aws-cdk-lib": "~2.68.0",
"aws-cdk-lib": "~2.80.0",
"aws-sdk": "^2.1405.0",
"axios": "^0.26.0",
"chalk": "^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-category-custom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"dependencies": {
"@aws-amplify/amplify-cli-core": "4.2.0",
"@aws-amplify/amplify-prompts": "2.8.0",
"aws-cdk-lib": "~2.68.0",
"aws-cdk-lib": "~2.80.0",
"execa": "^5.1.1",
"fs-extra": "^8.1.0",
"glob": "^7.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-category-custom/resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@aws-amplify/cli-extensibility-helper": "^3.0.0",
"aws-cdk-lib": "~2.68.0",
"aws-cdk-lib": "~2.80.0",
"constructs": "^10.0.5"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-category-function/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"folder-hash": "^4.0.2",
"fs-extra": "^8.1.0",
"globby": "^11.0.3",
"graphql-transformer-core": "^8.1.3",
"graphql-transformer-core": "^8.1.8",
"inquirer": "^7.3.3",
"inquirer-datepicker": "^2.0.0",
"jstreemap": "^1.28.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-category-geo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"ajv": "^6.12.6",
"amplify-headless-interface": "1.17.4",
"amplify-util-headless-input": "1.9.13",
"aws-cdk-lib": "~2.68.0",
"aws-cdk-lib": "~2.80.0",
"aws-sdk": "^2.1405.0",
"constructs": "^10.0.5",
"fs-extra": "^8.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-category-storage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@aws-amplify/cli-extensibility-helper": "3.0.10",
"amplify-headless-interface": "1.17.4",
"amplify-util-headless-input": "1.9.13",
"aws-cdk-lib": "~2.68.0",
"aws-cdk-lib": "~2.80.0",
"aws-sdk": "^2.1405.0",
"chalk": "^4.1.1",
"constructs": "^10.0.5",
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-cli-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"@aws-amplify/amplify-cli-logger": "1.3.3",
"@aws-amplify/amplify-function-plugin-interface": "1.11.0",
"@aws-amplify/amplify-prompts": "2.8.0",
"@aws-amplify/graphql-transformer-interfaces": "^2.2.2",
"@aws-amplify/graphql-transformer-interfaces": "^2.2.5",
"@yarnpkg/lockfile": "^1.1.0",
"ajv": "^6.12.6",
"aws-cdk-lib": "~2.68.0",
"aws-cdk-lib": "~2.80.0",
"chalk": "^4.1.1",
"ci-info": "^3.8.0",
"cli-table3": "^0.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-cli-extensibility-helper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"dependencies": {
"@aws-amplify/amplify-category-custom": "3.1.0",
"@aws-amplify/amplify-cli-core": "4.2.0",
"aws-cdk-lib": "~2.68.0"
"aws-cdk-lib": "~2.80.0"
},
"jest": {
"transform": {
Expand Down
8 changes: 4 additions & 4 deletions packages/amplify-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"dependencies": {
"@aws-amplify/amplify-app": "5.0.10",
"@aws-amplify/amplify-category-analytics": "5.0.12",
"@aws-amplify/amplify-category-api": "^5.4.2",
"@aws-amplify/amplify-category-api": "^5.4.7",
"@aws-amplify/amplify-category-auth": "3.4.0",
"@aws-amplify/amplify-category-custom": "3.1.0",
"@aws-amplify/amplify-category-function": "5.4.0",
Expand Down Expand Up @@ -66,14 +66,14 @@
"@aws-amplify/amplify-util-mock": "5.4.0",
"@aws-amplify/amplify-util-uibuilder": "1.9.0",
"@aws-cdk/cloudformation-diff": "~2.68.0",
"amplify-codegen": "^4.1.2",
"amplify-codegen": "^4.1.4",
"amplify-dotnet-function-runtime-provider": "2.0.5",
"amplify-go-function-runtime-provider": "2.3.23",
"amplify-java-function-runtime-provider": "2.3.23",
"amplify-java-function-template-provider": "1.5.22",
"amplify-nodejs-function-runtime-provider": "2.5.0",
"amplify-python-function-runtime-provider": "2.4.23",
"aws-cdk-lib": "~2.68.0",
"aws-cdk-lib": "~2.80.0",
"aws-sdk": "^2.1405.0",
"chalk": "^4.1.1",
"ci-info": "^3.8.0",
Expand All @@ -87,7 +87,7 @@
"fs-extra": "^8.1.0",
"glob": "^7.2.0",
"graphql": "^15.5.0",
"graphql-transformer-core": "^8.1.3",
"graphql-transformer-core": "^8.1.8",
"gunzip-maybe": "^1.4.2",
"hidefile": "^3.0.0",
"ini": "^1.3.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-container-hosting/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"extract-api": "ts-node ../../scripts/extract-api.ts"
},
"dependencies": {
"@aws-amplify/amplify-category-api": "^5.4.2",
"@aws-amplify/amplify-category-api": "^5.4.7",
"@aws-amplify/amplify-cli-core": "4.2.0",
"@aws-amplify/amplify-environment-parameters": "1.7.0",
"fs-extra": "^8.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"dependencies": {
"@aws-amplify/amplify-cli-core": "4.2.0",
"@aws-amplify/amplify-function-plugin-interface": "1.11.0",
"graphql-transformer-core": "^8.1.3"
"graphql-transformer-core": "^8.1.8"
},
"devDependencies": {
"@types/inquirer": "^6.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-e2e-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"dotenv": "^8.2.0",
"execa": "^5.1.1",
"fs-extra": "^8.1.0",
"graphql-transformer-core": "^8.1.3",
"graphql-transformer-core": "^8.1.8",
"ini": "^1.3.5",
"jest-circus": "^27.0.0",
"jest-environment-node": "^26.6.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/amplify-e2e-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@aws-amplify/amplify-cli-core": "4.2.0",
"@aws-amplify/amplify-e2e-core": "5.1.0",
"@aws-amplify/amplify-opensearch-simulator": "1.5.0",
"@aws-amplify/graphql-transformer-core": "^1.3.3",
"@aws-amplify/graphql-transformer-core": "^1.3.8",
"@aws-sdk/client-appsync": "^3.303.0",
"@aws-sdk/client-dynamodb": "^3.303.0",
"@aws-sdk/client-ssm": "^3.303.0",
Expand All @@ -38,7 +38,7 @@
"amplify-storage-simulator": "1.10.0",
"aws-amplify": "^4.2.8",
"aws-appsync": "^4.1.1",
"aws-cdk-lib": "~2.68.0",
"aws-cdk-lib": "~2.80.0",
"aws-sdk": "^2.1405.0",
"axios": "^0.26.0",
"circleci-api": "^4.1.4",
Expand All @@ -50,7 +50,7 @@
"fs-extra": "^8.1.0",
"glob": "^8.0.3",
"graphql-tag": "^2.10.1",
"graphql-transformer-core": "^8.1.3",
"graphql-transformer-core": "^8.1.8",
"isomorphic-fetch": "^3.0.0",
"lodash": "^4.17.21",
"node-fetch": "^2.6.7",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import {
getAppId,
addAuthWithDefault,
addS3WithGuestAccess,
/* TEMPORARY-PR12830: Remove after we ship PR12830 */
useLatestExtensibilityHelper,
/* END TEMPORARY */
} from '@aws-amplify/amplify-e2e-core';
import * as fs from 'fs-extra';
import * as path from 'path';
Expand Down Expand Up @@ -41,6 +44,11 @@ describe('adding custom resources test', () => {
const srcCustomResourceFilePath = path.join(__dirname, '..', '..', 'custom-resources', 'custom-cdk-stack-with-storage.ts');
const destCustomResourceFilePath = path.join(projRoot, 'amplify', 'backend', 'custom', cdkResourceName, 'cdk-stack.ts');
fs.copyFileSync(srcCustomResourceFilePath, destCustomResourceFilePath);
/* TEMPORARY-PR12830: Remove after we ship PR12830
* this is required to jump over breaking change between 2.68 and 2.80 of CDK.
*/
useLatestExtensibilityHelper(projRoot, cdkResourceName);
/* END TEMPORARY */
await buildCustomResources(projRoot);
await amplifyPushAuth(projRoot);
await gitCleanFdX(projRoot);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ describe('adding custom resources test', () => {
const srcCustomResourceFilePath = path.join(__dirname, '..', '..', 'custom-resources', 'custom-cdk-stack.ts');
fs.copyFileSync(srcCustomResourceFilePath, destCustomResourceFilePath);

await buildCustomResources(projRoot);
/* TEMPORARY-PR12830: Uncomment after we ship PR12830
* this is required to jump over breaking change between 2.68 and 2.80 of CDK.
*/
// await buildCustomResources(projRoot);
/* END TEMPORARY */

// check if latest @aws-amplify/cli-extensibility-helper works
// skip on Windows, we don't start local registry there
Expand Down
44 changes: 22 additions & 22 deletions packages/amplify-graphql-migration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,30 +44,30 @@
},
"devDependencies": {
"@aws-amplify/amplify-prompts": "2.8.0",
"@aws-amplify/graphql-auth-transformer": "^2.1.7",
"@aws-amplify/graphql-default-value-transformer": "^1.1.7",
"@aws-amplify/graphql-function-transformer": "^1.2.5",
"@aws-amplify/graphql-http-transformer": "^1.2.5",
"@aws-amplify/graphql-index-transformer": "^1.2.3",
"@aws-amplify/graphql-model-transformer": "^1.3.3",
"@aws-amplify/graphql-predictions-transformer": "^1.2.5",
"@aws-amplify/graphql-relational-transformer": "^1.2.3",
"@aws-amplify/graphql-searchable-transformer": "^1.2.5",
"@aws-amplify/graphql-transformer-core": "^1.3.3",
"@aws-amplify/graphql-transformer-interfaces": "2.2.2",
"@aws-amplify/graphql-transformer-migrator": "^2.1.7",
"@aws-amplify/graphql-auth-transformer": "^2.1.12",
"@aws-amplify/graphql-default-value-transformer": "^1.1.12",
"@aws-amplify/graphql-function-transformer": "^1.2.10",
"@aws-amplify/graphql-http-transformer": "^1.2.10",
"@aws-amplify/graphql-index-transformer": "^1.2.8",
"@aws-amplify/graphql-model-transformer": "^1.3.8",
"@aws-amplify/graphql-predictions-transformer": "^1.2.10",
"@aws-amplify/graphql-relational-transformer": "^1.2.8",
"@aws-amplify/graphql-searchable-transformer": "^1.2.10",
"@aws-amplify/graphql-transformer-core": "^1.3.8",
"@aws-amplify/graphql-transformer-interfaces": "2.2.5",
"@aws-amplify/graphql-transformer-migrator": "^2.1.12",
"@aws-cdk/cloudformation-diff": "~2.68.0",
"fs-extra": "^8.1.0",
"graphql-auth-transformer": "^7.2.57",
"graphql-connection-transformer": "^5.2.56",
"graphql-dynamodb-transformer": "^7.2.56",
"graphql-elasticsearch-transformer": "^5.2.57",
"graphql-function-transformer": "^3.3.47",
"graphql-http-transformer": "^5.2.56",
"graphql-key-transformer": "^3.2.56",
"graphql-predictions-transformer": "^3.2.56",
"graphql-transformer-core": "^8.1.3",
"graphql-versioned-transformer": "^5.2.56"
"graphql-auth-transformer": "^7.2.62",
"graphql-connection-transformer": "^5.2.61",
"graphql-dynamodb-transformer": "^7.2.61",
"graphql-elasticsearch-transformer": "^5.2.62",
"graphql-function-transformer": "^3.3.52",
"graphql-http-transformer": "^5.2.61",
"graphql-key-transformer": "^3.2.61",
"graphql-predictions-transformer": "^3.2.61",
"graphql-transformer-core": "^8.1.8",
"graphql-versioned-transformer": "^5.2.61"
},
"berry": {
"plugins": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@aws-amplify/cli-extensibility-helper": "^3.0.0",
"aws-cdk-lib": "~2.53.0",
"aws-cdk-lib": "~2.80.0",
"constructs": "^10.0.5"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-migration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"@aws-amplify/amplify-cli-core": "4.2.0",
"@aws-amplify/amplify-e2e-core": "5.1.0",
"@aws-cdk/cloudformation-diff": "~2.68.0",
"aws-cdk-lib": "~2.68.0",
"aws-cdk-lib": "~2.80.0",
"constructs": "^10.0.5",
"fs-extra": "^8.1.0",
"graphql-transformer-core": "^8.1.3",
"graphql-transformer-core": "^8.1.8",
"lodash": "^4.17.21",
"semver": "^7.5.4",
"strip-ansi": "^6.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@aws-amplify/amplify-cli-core": "4.2.0",
"@aws-amplify/amplify-function-plugin-interface": "1.11.0",
"@aws-amplify/amplify-prompts": "2.8.0",
"graphql-transformer-core": "^8.1.3",
"graphql-transformer-core": "^8.1.8",
"lodash": "^4.17.21"
},
"devDependencies": {
Expand Down
12 changes: 6 additions & 6 deletions packages/amplify-provider-awscloudformation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
"@aws-amplify/amplify-prompts": "2.8.0",
"@aws-amplify/amplify-util-import": "2.7.0",
"@aws-amplify/cli-extensibility-helper": "3.0.10",
"@aws-amplify/graphql-transformer-core": "^1.3.3",
"@aws-amplify/graphql-transformer-interfaces": "^2.2.2",
"amplify-codegen": "^4.1.2",
"@aws-amplify/graphql-transformer-core": "^1.3.8",
"@aws-amplify/graphql-transformer-interfaces": "^2.2.5",
"amplify-codegen": "^4.1.4",
"archiver": "^5.3.0",
"aws-cdk-lib": "~2.68.0",
"aws-cdk-lib": "~2.80.0",
"aws-sdk": "^2.1405.0",
"bottleneck": "2.19.5",
"chalk": "^4.1.1",
Expand All @@ -53,7 +53,7 @@
"fs-extra": "^8.1.0",
"glob": "^7.2.0",
"graphql": "^15.5.0",
"graphql-transformer-core": "^8.1.3",
"graphql-transformer-core": "^8.1.8",
"ignore": "^5.2.0",
"ini": "^1.3.5",
"inquirer": "^7.3.3",
Expand All @@ -72,7 +72,7 @@
"xstate": "^4.14.0"
},
"devDependencies": {
"@aws-amplify/graphql-transformer-interfaces": "^2.2.2",
"@aws-amplify/graphql-transformer-interfaces": "^2.2.5",
"@types/columnify": "^1.5.0",
"@types/deep-diff": "^1.0.0",
"@types/folder-hash": "^4.0.1",
Expand Down
40 changes: 20 additions & 20 deletions packages/amplify-util-mock/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,19 @@
},
"devDependencies": {
"@aws-amplify/amplify-function-plugin-interface": "1.11.0",
"@aws-amplify/graphql-auth-transformer": "^2.1.7",
"@aws-amplify/graphql-default-value-transformer": "^1.1.7",
"@aws-amplify/graphql-function-transformer": "^1.2.5",
"@aws-amplify/graphql-http-transformer": "1.2.5",
"@aws-amplify/graphql-index-transformer": "^1.2.3",
"@aws-amplify/graphql-maps-to-transformer": "^2.1.7",
"@aws-amplify/graphql-model-transformer": "^1.3.3",
"@aws-amplify/graphql-predictions-transformer": "^1.2.5",
"@aws-amplify/graphql-relational-transformer": "^1.2.3",
"@aws-amplify/graphql-searchable-transformer": "^1.2.5",
"@aws-amplify/graphql-transformer-core": "^1.3.3",
"@aws-amplify/graphql-transformer-interfaces": "^2.2.2",
"@aws-amplify/graphql-transformer-migrator": "^2.1.7",
"@aws-amplify/graphql-auth-transformer": "^2.1.12",
"@aws-amplify/graphql-default-value-transformer": "^1.1.12",
"@aws-amplify/graphql-function-transformer": "^1.2.10",
"@aws-amplify/graphql-http-transformer": "1.2.10",
"@aws-amplify/graphql-index-transformer": "^1.2.8",
"@aws-amplify/graphql-maps-to-transformer": "^2.1.12",
"@aws-amplify/graphql-model-transformer": "^1.3.8",
"@aws-amplify/graphql-predictions-transformer": "^1.2.10",
"@aws-amplify/graphql-relational-transformer": "^1.2.8",
"@aws-amplify/graphql-searchable-transformer": "^1.2.10",
"@aws-amplify/graphql-transformer-core": "^1.3.8",
"@aws-amplify/graphql-transformer-interfaces": "^2.2.5",
"@aws-amplify/graphql-transformer-migrator": "^2.1.12",
"@types/detect-port": "^1.3.0",
"@types/jest": "^29.0.0",
"@types/lodash": "^4.14.149",
Expand All @@ -80,14 +80,14 @@
"aws-sdk-mock": "^5.8.0",
"axios": "^0.26.0",
"graphql": "^15.5.0",
"graphql-auth-transformer": "^7.2.57",
"graphql-connection-transformer": "^5.2.56",
"graphql-dynamodb-transformer": "^7.2.56",
"graphql-function-transformer": "^3.3.47",
"graphql-key-transformer": "^3.2.56",
"graphql-auth-transformer": "^7.2.62",
"graphql-connection-transformer": "^5.2.61",
"graphql-dynamodb-transformer": "^7.2.61",
"graphql-function-transformer": "^3.3.52",
"graphql-key-transformer": "^3.2.61",
"graphql-tag": "^2.10.1",
"graphql-transformer-core": "^8.1.3",
"graphql-versioned-transformer": "^5.2.56",
"graphql-transformer-core": "^8.1.8",
"graphql-versioned-transformer": "^5.2.61",
"isomorphic-fetch": "^3.0.0",
"jest": "^29.0.0",
"jsonwebtoken": "^9.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ describe('@searchable transformer', () => {
try {
const transformer = new GraphQLTransform({
transformers: [new ModelTransformer(), new SearchableModelTransformer()],
sandboxModeEnabled: true,
transformParameters: {
sandboxModeEnabled: true,
},
});
const out = await transformer.transform(validSchema);
let ddbClient;
Expand Down
Loading

0 comments on commit 8815aff

Please sign in to comment.