Gen2 migrations merge from dev and renames around prepare command and resourceMappings by abhi7cr · Pull Request #14177 · aws-amplify/amplify-cli

abhi7cr · 2025-04-17T04:03:08Z

Description of changes

Merge from dev
Rename customResourceMap to resourceMappings to make it more generic.
Fix lint errors
Rename start command to prepare

Description of how you validated changes

unit tests

Checklist

PR description included
yarn test passes
Tests are changed or added
Relevant documentation is changed or added (and PR referenced)
New AWS SDK calls or CloudFormation actions have been added to relevant test and service IAM policies
Pull request labels are added

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

BREAKING CHANGE: Update node to 22

…script chore: update packages that depend on `serialize-javascript`

- @aws-amplify/amplify-app@5.0.41 - @aws-amplify/amplify-category-analytics@5.0.40 - @aws-amplify/amplify-category-auth@3.7.20 - @aws-amplify/amplify-category-geo@3.5.20 - @aws-amplify/amplify-category-interactions@5.1.33 - @aws-amplify/amplify-category-notifications@2.26.30 - @aws-amplify/amplify-category-predictions@5.5.20 - @aws-amplify/amplify-category-storage@5.5.19 - @aws-amplify/cli@13.0.0 - @aws-amplify/cli-internal@13.0.0 - amplify-e2e-tests@4.11.5 - amplify-nodejs-function-runtime-provider@2.5.28 - @aws-amplify/amplify-provider-awscloudformation@8.11.6 - @aws-amplify/amplify-util-mock@5.10.14

…1aa3 chore(release): Merge main into dev

…version-bump chore: bump codegen version to 4.10.3

* fix: lerna update * chore: prettier update * chore: added newlines * chore(release): Publish tagged release 12.14.4-lerna-v8 - @aws-amplify/amplify-app@5.0.42-12.14.4-lerna-v8.0 - @aws-amplify/amplify-appsync-simulator@2.16.12-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-analytics@5.0.41-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-auth@3.7.21-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-custom@3.1.28-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-function@5.7.14-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-geo@3.5.21-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-hosting@3.5.41-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-interactions@5.1.34-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-notifications@2.26.31-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-predictions@5.5.21-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-storage@5.5.20-12.14.4-lerna-v8.0 - @aws-amplify/cli-internal@13.0.1-12.14.4-lerna-v8.0 - @aws-amplify/amplify-cli-core@4.4.1-12.14.4-lerna-v8.0 - @aws-amplify/cli-extensibility-helper@3.0.38-12.14.4-lerna-v8.0 - @aws-amplify/cli@13.0.1-12.14.4-lerna-v8.0 - @aws-amplify/amplify-console-hosting@2.5.38-12.14.4-lerna-v8.0 - @aws-amplify/amplify-console-integration-tests@2.11.22-12.14.4-lerna-v8.0 - @aws-amplify/amplify-container-hosting@2.8.18-12.14.4-lerna-v8.0 - amplify-dotnet-function-runtime-provider@2.1.4-12.14.4-lerna-v8.0 - @aws-amplify/amplify-dotnet-function-template-provider@2.7.4-12.14.4-lerna-v8.0 - amplify-dynamodb-simulator@2.9.23-12.14.4-lerna-v8.0 - @aws-amplify/amplify-e2e-core@5.7.4-12.14.4-lerna-v8.0 - amplify-e2e-tests@4.11.6-12.14.4-lerna-v8.0 - @aws-amplify/amplify-environment-parameters@1.9.19-12.14.4-lerna-v8.0 - @aws-amplify/amplify-frontend-ios@3.7.12-12.14.4-lerna-v8.0 - @aws-amplify/amplify-frontend-javascript@3.10.22-12.14.4-lerna-v8.0 - amplify-go-function-runtime-provider@2.3.51-12.14.4-lerna-v8.0 - @aws-amplify/amplify-graphiql-explorer@2.6.1-12.14.4-lerna-v8.0 - amplify-java-function-runtime-provider@2.3.51-12.14.4-lerna-v8.0 - @aws-amplify/amplify-migration-tests@6.5.5-12.14.4-lerna-v8.0 - amplify-nodejs-function-runtime-provider@2.5.29-12.14.4-lerna-v8.0 - @aws-amplify/amplify-nodejs-function-template-provider@2.10.14-12.14.4-lerna-v8.0 - @aws-amplify/amplify-opensearch-simulator@1.7.19-12.14.4-lerna-v8.0 - @aws-amplify/amplify-provider-awscloudformation@8.11.7-12.14.4-lerna-v8.0 - amplify-python-function-runtime-provider@2.4.51-12.14.4-lerna-v8.0 - @aws-amplify/amplify-util-mock@5.10.15-12.14.4-lerna-v8.0 - @aws-amplify/amplify-util-uibuilder@1.14.19-12.14.4-lerna-v8.0 * Revert "chore(release): Publish tagged release 12.14.4-lerna-v8" This reverts commit b52bcec. --------- Co-authored-by: Shadowcat567 <lvielto@amazon.com> Co-authored-by: aws-amplify-bot <aws@amazon.com>

Bumps [axios](https://github.com/axios/axios) from 1.7.4 to 1.8.2. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.7.4...v1.8.2) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>

…ripts/axios-1.8.2 chore(deps): bump axios from 1.7.4 to 1.8.2 in /scripts

* chore(deps): bump aws-cdk-lib from 2.177.0 to 2.184.0 Bumps [aws-cdk-lib](https://github.com/aws/aws-cdk/tree/HEAD/packages/aws-cdk-lib) from 2.177.0 to 2.184.0. - [Release notes](https://github.com/aws/aws-cdk/releases) - [Changelog](https://github.com/aws/aws-cdk/blob/main/CHANGELOG.v2.alpha.md) - [Commits](https://github.com/aws/aws-cdk/commits/v2.184.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: dedupe * fix that --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kamil Sobol <5849952+sobolk@users.noreply.github.com>

Bumps [tar-fs](https://github.com/mafintosh/tar-fs) from 2.1.1 to 2.1.2. - [Commits](mafintosh/tar-fs@v2.1.1...v2.1.2) --- updated-dependencies: - dependency-name: tar-fs dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [aws-cdk-lib](https://github.com/aws/aws-cdk/tree/HEAD/packages/aws-cdk-lib) from 2.184.1 to 2.187.0. - [Release notes](https://github.com/aws/aws-cdk/releases) - [Changelog](https://github.com/aws/aws-cdk/blob/main/CHANGELOG.v2.alpha.md) - [Commits](https://github.com/aws/aws-cdk/commits/v2.187.0/packages/aws-cdk-lib) --- updated-dependencies: - dependency-name: aws-cdk-lib dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…14171)

BREAKING CHANGE: Update node to 22

* fix: lerna update * chore: prettier update * chore: added newlines * chore(release): Publish tagged release 12.14.4-lerna-v8 - @aws-amplify/amplify-app@5.0.42-12.14.4-lerna-v8.0 - @aws-amplify/amplify-appsync-simulator@2.16.12-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-analytics@5.0.41-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-auth@3.7.21-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-custom@3.1.28-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-function@5.7.14-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-geo@3.5.21-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-hosting@3.5.41-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-interactions@5.1.34-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-notifications@2.26.31-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-predictions@5.5.21-12.14.4-lerna-v8.0 - @aws-amplify/amplify-category-storage@5.5.20-12.14.4-lerna-v8.0 - @aws-amplify/cli-internal@13.0.1-12.14.4-lerna-v8.0 - @aws-amplify/amplify-cli-core@4.4.1-12.14.4-lerna-v8.0 - @aws-amplify/cli-extensibility-helper@3.0.38-12.14.4-lerna-v8.0 - @aws-amplify/cli@13.0.1-12.14.4-lerna-v8.0 - @aws-amplify/amplify-console-hosting@2.5.38-12.14.4-lerna-v8.0 - @aws-amplify/amplify-console-integration-tests@2.11.22-12.14.4-lerna-v8.0 - @aws-amplify/amplify-container-hosting@2.8.18-12.14.4-lerna-v8.0 - amplify-dotnet-function-runtime-provider@2.1.4-12.14.4-lerna-v8.0 - @aws-amplify/amplify-dotnet-function-template-provider@2.7.4-12.14.4-lerna-v8.0 - amplify-dynamodb-simulator@2.9.23-12.14.4-lerna-v8.0 - @aws-amplify/amplify-e2e-core@5.7.4-12.14.4-lerna-v8.0 - amplify-e2e-tests@4.11.6-12.14.4-lerna-v8.0 - @aws-amplify/amplify-environment-parameters@1.9.19-12.14.4-lerna-v8.0 - @aws-amplify/amplify-frontend-ios@3.7.12-12.14.4-lerna-v8.0 - @aws-amplify/amplify-frontend-javascript@3.10.22-12.14.4-lerna-v8.0 - amplify-go-function-runtime-provider@2.3.51-12.14.4-lerna-v8.0 - @aws-amplify/amplify-graphiql-explorer@2.6.1-12.14.4-lerna-v8.0 - amplify-java-function-runtime-provider@2.3.51-12.14.4-lerna-v8.0 - @aws-amplify/amplify-migration-tests@6.5.5-12.14.4-lerna-v8.0 - amplify-nodejs-function-runtime-provider@2.5.29-12.14.4-lerna-v8.0 - @aws-amplify/amplify-nodejs-function-template-provider@2.10.14-12.14.4-lerna-v8.0 - @aws-amplify/amplify-opensearch-simulator@1.7.19-12.14.4-lerna-v8.0 - @aws-amplify/amplify-provider-awscloudformation@8.11.7-12.14.4-lerna-v8.0 - amplify-python-function-runtime-provider@2.4.51-12.14.4-lerna-v8.0 - @aws-amplify/amplify-util-mock@5.10.15-12.14.4-lerna-v8.0 - @aws-amplify/amplify-util-uibuilder@1.14.19-12.14.4-lerna-v8.0 * Revert "chore(release): Publish tagged release 12.14.4-lerna-v8" This reverts commit b52bcec. --------- Co-authored-by: Shadowcat567 <lvielto@amazon.com> Co-authored-by: aws-amplify-bot <aws@amazon.com>

Bumps [axios](https://github.com/axios/axios) from 1.7.4 to 1.8.2. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.7.4...v1.8.2) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump aws-cdk-lib from 2.177.0 to 2.184.0 Bumps [aws-cdk-lib](https://github.com/aws/aws-cdk/tree/HEAD/packages/aws-cdk-lib) from 2.177.0 to 2.184.0. - [Release notes](https://github.com/aws/aws-cdk/releases) - [Changelog](https://github.com/aws/aws-cdk/blob/main/CHANGELOG.v2.alpha.md) - [Commits](https://github.com/aws/aws-cdk/commits/v2.184.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: dedupe * fix that --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kamil Sobol <5849952+sobolk@users.noreply.github.com>

Bumps [tar-fs](https://github.com/mafintosh/tar-fs) from 2.1.1 to 2.1.2. - [Commits](mafintosh/tar-fs@v2.1.1...v2.1.2) --- updated-dependencies: - dependency-name: tar-fs dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [aws-cdk-lib](https://github.com/aws/aws-cdk/tree/HEAD/packages/aws-cdk-lib) from 2.184.1 to 2.187.0. - [Release notes](https://github.com/aws/aws-cdk/releases) - [Changelog](https://github.com/aws/aws-cdk/blob/main/CHANGELOG.v2.alpha.md) - [Commits](https://github.com/aws/aws-cdk/commits/v2.187.0/packages/aws-cdk-lib) --- updated-dependencies: - dependency-name: aws-cdk-lib dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…14171)

bzsurbhi · 2025-04-17T22:18:23Z

+      if (!resourceMappings.startsWith(FILE_PROTOCOL_PREFIX)) {
+        throw new Error(`Expected resourceMap to start with ${FILE_PROTOCOL_PREFIX}`);
+      }
+      const resourceMapPath = resourceMappings.split(FILE_PROTOCOL_PREFIX)[1];


Should we check the length of resourceMappings after split? If length is 2, then we get [1]
If resourceMappings is only file:// then this would fail right?

yup, that's a good validation to fail fast on :)

Vieltojarvi and others added 30 commits February 21, 2025 11:57

chore: updated terser-webpack-plugin and css-minimizer-webpack-plugin

39d073a

chore: bumped workbox-webpack-plugin

028d69e

feat!: Update node to 22 (#14121)

ae8aeaf

BREAKING CHANGE: Update node to 22

Merge branch 'dev' into update-deps/serialize-javascript

bb3fcdf

Merge pull request #14119 from aws-amplify/update-deps/serialize-java…

c97b5ae

…script chore: update packages that depend on `serialize-javascript`

"chore: merge release commit from main to dev"

ccd99fc

Merge pull request #14125 from aws-amplify/dev-main-merge-e1ad3ffda20…

1548f4a

…1aa3 chore(release): Merge main into dev

Merge pull request #14124 from aws-amplify/guest/data/codegen-4.10.3-…

3f7dd9b

…version-bump chore: bump codegen version to 4.10.3

Merge pull request #14135 from aws-amplify/dependabot/npm_and_yarn/sc…

a58b78d

…ripts/axios-1.8.2 chore(deps): bump axios from 1.7.4 to 1.8.2 in /scripts

chore: upgrade data packages (#14141)

286c5d5

chore(deps): bump aws-cdk-lib from 2.184.1 to 2.187.0 (#14170)

07c90ab

chore: upgrade data packages (#14162)

4126d80

chore: upgrade aws-cdk to 2.187.0 in custom resource migration tests (#…

e936bfd

…14171)

fix: merge from dev

1fc7caa

chore: updated terser-webpack-plugin and css-minimizer-webpack-plugin

ab1c284

chore: bumped workbox-webpack-plugin

6b524a2

feat!: Update node to 22 (#14121)

380c3ab

BREAKING CHANGE: Update node to 22

chore(deps): bump aws-cdk-lib from 2.184.1 to 2.187.0 (#14170)

8a0d1f5

chore: upgrade data packages (#14162)

c17c7e8

Amplifiyer and others added 3 commits April 16, 2025 16:53

chore: upgrade aws-cdk to 2.187.0 in custom resource migration tests (#…

15d5860

…14171)

Merge branch 'migrations' into gen2-migrations-execute

c1ff1a4

fix: refactor customResourceMappings in execute command

000d660

abhi7cr requested review from a team as code owners April 17, 2025 04:03

rjabhi added 3 commits April 16, 2025 21:46

fix: lock file

fdb2079

fix: import path for types

fde06aa

fix: update lock file

699f9e7

abhi7cr changed the title ~~Gen2 migrations execute~~ Gen2 migrations merge from dev and renames around prepare command and resourceMappings Apr 17, 2025

rjabhi added 5 commits April 17, 2025 11:12

chore: update API.md, gen2 codegen cdk-lib minor version

9779979

chore: update yarn.lock

4d95f90

fix: versions in cli-core

c36be0f

chore: update API.md

00fc019

fix: lint errors

00b25b7

bzsurbhi reviewed Apr 17, 2025

View reviewed changes

fix(migrate): add validation for path after file://

0173f7f

bzsurbhi approved these changes Apr 17, 2025

View reviewed changes

abhi7cr merged commit 9a4e1b6 into migrations Apr 17, 2025
4 checks passed

abhi7cr deleted the gen2-migrations-execute branch April 17, 2025 23:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Gen2 migrations merge from dev and renames around prepare command and resourceMappings#14177

Gen2 migrations merge from dev and renames around prepare command and resourceMappings#14177
abhi7cr merged 42 commits intomigrationsfrom
gen2-migrations-execute

abhi7cr commented Apr 17, 2025 •

edited

Loading

Uh oh!

bzsurbhi Apr 17, 2025

Uh oh!

abhi7cr Apr 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

abhi7cr commented Apr 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of changes

Description of how you validated changes

Checklist

Uh oh!

bzsurbhi Apr 17, 2025

Choose a reason for hiding this comment

Uh oh!

abhi7cr Apr 17, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

abhi7cr commented Apr 17, 2025 •

edited

Loading