Merge Gen 2 Migration changes to Dev

.circleci/local_publish_helpers_codebuild.sh

@@ -297,6 +297,29 @@ function runE2eTestCb {
     fi
 }
 
+function runGen2MigrationsE2ETestCb {
+    _setupCoverage
+    FAILED_TEST_REGEX_FILE="./amplify-migration-e2e-reports/amplify-migration-e2e-failed-test.txt"
+
+    if [ -f  $FAILED_TEST_REGEX_FILE ]; then
+        # read the content of failed tests
+        failedTests=$(<$FAILED_TEST_REGEX_FILE)
+        if [[ ! -z "$DISABLE_COVERAGE" ]]; then
+            echo Running WITHOUT coverage
+            yarn e2e-migration --forceExit --no-cache --maxWorkers=4 $TEST_SUITE -t "$failedTests"
+        else
+            NODE_V8_COVERAGE=$E2E_TEST_COVERAGE_DIR yarn e2e-migration --forceExit --no-cache --maxWorkers=4 $TEST_SUITE -t "$failedTests"
+        fi
+    else
+        if [[ ! -z "$DISABLE_COVERAGE" ]]; then
+            echo Running WITHOUT coverage
+            yarn e2e-migration --forceExit --no-cache --maxWorkers=4 $TEST_SUITE
+        else
+            NODE_V8_COVERAGE=$E2E_TEST_COVERAGE_DIR yarn e2e-migration --forceExit --no-cache --maxWorkers=4 $TEST_SUITE
+        fi
+    fi
+}
+
 function _setupCoverage {
     _teardownCoverage
     echo "Setup Coverage ($E2E_TEST_COVERAGE_DIR)"

.eslint-dictionary.json

@@ -21,6 +21,7 @@
   "amplifymeta",
   "amplifyrc",
   "amplifytools",
+  "ampx",
   "ansi",
   "apigateway",
   "apigw",
@@ -49,6 +50,7 @@
   "axios",
   "babelrc",
   "backend",
+  "backends",
   "balancer",
   "basedir",
   "birthdate",
@@ -60,6 +62,7 @@
   "bugfix",
   "buildable",
   "buildspec",
+  "bundler",
   "callout",
   "camelcase",
   "cancellable",
@@ -85,6 +88,7 @@
   "cname",
   "codebase",
   "codegen",
+  "codegentest",
   "codepipeline",
   "codesuite",
   "cognito",
@@ -125,6 +129,7 @@
   "doctype",
   "dotenv",
   "dotnet",
+  "downloader",
   "durations",
   "dynamodb",
   "ecluster",
@@ -134,6 +139,7 @@
   "ejs",
   "elasticsearch",
   "emacs",
+  "enablegen2migration",
   "endian",
   "enode",
   "entrypoint",
@@ -142,7 +148,9 @@
   "enums",
   "epath",
   "errno",
+  "esbuild",
   "esri",
+  "esModuleInterop",
   "etag",
   "execa",
   "executables",
@@ -160,6 +168,7 @@
   "frontend",
   "frontends",
   "fsext",
+  "fullname",
   "func",
   "funcs",
   "generatable",
@@ -256,6 +265,7 @@
   "multifactor",
   "multipart",
   "mutex",
+  "mygen2app",
   "namespace",
   "netcoreapp",
   "netmask",
@@ -329,6 +339,8 @@
   "regenerator",
   "regexes",
   "rekognition",
+  "renderer",
+  "renderers",
   "repo",
   "reqheaders",
   "resolvers",
@@ -340,6 +352,7 @@
   "runnable",
   "runtimes",
   "sagemaker",
+  "saml",
   "scannable",
   "schemadeployer",
   "schemas",
@@ -375,6 +388,7 @@
   "syncable",
   "tablename",
   "tailwindcss",
+  "templategen",
   "testother",
   "testschemadeployer",
   "textract",
@@ -398,6 +412,7 @@
   "ulid",
   "unauth",
   "uncompiled",
+  "uncommented",
   "unicode",
   "unix",
   "unlink",
@@ -410,10 +425,12 @@
   "unstaged",
   "unsubstituted",
   "untyped",
+  "unzipper",
   "updateamplify",
   "uploader",
   "upsert",
   "upvotes",
+  "uris",
   "urlencoded",
   "urls",
   "userpool",
@@ -426,6 +443,7 @@
   "venv",
   "verificationbucket",
   "versioned",
+  "versioning",
   "vert",
   "virtualenv",
   "vpc",
@@ -449,5 +467,6 @@
   "yarnrc",
   "yesno",
   "yyyymmddhhmmss",
-  "zoneinfo"
+  "zoneinfo",
+  "yargs"
 ]

codebuild_specs/e2e_workflow_base.yml

@@ -136,6 +136,12 @@ batch:
         compute-type: BUILD_GENERAL1_LARGE
       depend-on:
         - upb
+    - identifier: gen2_migrations_e2e_test
+      buildspec: codebuild_specs/run_gen2_migrations_e2e_tests_linux.yml
+      depend-on:
+        - upb
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
     - identifier: cleanup_resources
       buildspec: codebuild_specs/cleanup_resources.yml
       depend-on:

codebuild_specs/e2e_workflow_generated.yml

@@ -136,6 +136,12 @@ batch:
         compute-type: BUILD_GENERAL1_LARGE
       depend-on:
         - upb
+    - identifier: gen2_migrations_e2e_test
+      buildspec: codebuild_specs/run_gen2_migrations_e2e_tests_linux.yml
+      depend-on:
+        - upb
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
     - identifier: cleanup_resources
       buildspec: codebuild_specs/cleanup_resources.yml
       depend-on:

codebuild_specs/run_gen2_migrations_e2e_tests_linux.yml

@@ -0,0 +1,55 @@
+version: 0.2
+env:
+  shell: bash
+  variables:
+    E2E_TEST_COVERAGE_DIR: node_v8_coverage
+    CI: true
+    CIRCLECI: true
+    IS_AMPLIFY_CI: true
+    # mock values to test artifact scanning
+    ENV_VAR_WITH_SECRETS: 'MOCK_ENV_VAR_FOR_SCANNING_SECRETS'
+    MOCK_ENV_VAR_FOR_SCANNING_SECRETS: 'abc123xyz'
+
+    # mock values for credentials below
+    FACEBOOK_APP_ID: 'fbAppId'
+    FACEBOOK_APP_SECRET: 'fbAppSecret'
+    GOOGLE_APP_ID: 'gglAppID'
+    GOOGLE_APP_SECRET: 'gglAppSecret'
+    AMAZON_APP_ID: 'amaznAppID'
+    AMAZON_APP_SECRET: 'amaznAppID'
+    APPLE_APP_ID: 'com.fake.app'
+    APPLE_TEAM_ID: '2QLEWNDK6K'
+    APPLE_KEY_ID: '2QLZXKYJ8J'
+    # mock value, Cognito validates the private key, this is an invalidated key.
+    APPLE_PRIVATE_KEY_2: '----BEGIN PRIVATE KEY-----MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgIltgNsTgTfSzUadYiCS0VYtDDMFln/J8i1yJsSIw5g+gCgYIKoZIzj0DAQehRANCAASI8E0L/DhR/mIfTT07v3VwQu6q8I76lgn7kFhT0HvWoLuHKGQFcFkXXCgztgBrprzd419mUChAnKE6y89bWcNw----END PRIVATE KEY----'
+phases:
+  build:
+    commands:
+      # you can provide a codebuild source version to use old cache and skip all other jobs :)
+      - export NODE_OPTIONS=--max-old-space-size=4096
+      - export AMPLIFY_DIR=$CODEBUILD_SRC_DIR/out
+      - export AMPLIFY_PATH=$CODEBUILD_SRC_DIR/out/amplify-pkg-linux-x64
+      - echo $AMPLIFY_DIR
+      - echo $AMPLIFY_PATH
+      - npm install -g ts-node
+      - source ./shared-scripts.sh && _runGen2MigrationE2ETestsLinux
+  post_build:
+    commands:
+      - source ./shared-scripts.sh && _convertCoverage # && _uploadCoverageLinux (disabled while troubleshooting E2E test failures during initial CodeBuild setup)
+      - source ./shared-scripts.sh && _scanArtifacts
+      - source ./shared-scripts.sh && _uploadReportsToS3 $CODEBUILD_SOURCE_VERSION $CODEBUILD_BATCH_BUILD_IDENTIFIER amplify-migration-e2e
+artifacts:
+  files:
+    - '$E2E_TEST_COVERAGE_DIR/*'
+    - amplify-migration-e2e-reports/*
+  base-directory: packages/amplify-migration-e2e/
+reports:
+  e2e-reports:
+    files:
+      - '*.xml'
+    file-format: 'JUNITXML'
+    base-directory: '$CODEBUILD_SRC_DIR/packages/amplify-migration-e2e/junit'
+  e2e-coverage-report:
+    files:
+      - 'packages/amplify-migration-e2e/coverage/clover.xml'
+    file-format: CLOVERXML

jest.config.js

@@ -11,6 +11,7 @@ module.exports = {
     'packages/amplify-e2e-core/',
     'packages/amplify-e2e-tests/',
     'packages/amplify-console-integration-tests/',
+    'packages/amplify-migration-e2e/src/__tests__',
     'packages/graphql-transformers-e2e-tests/',
     'packages/amplify-util-mock/src/__e2e__/',
     'packages/amplify-ui-tests/',

package.json

@@ -20,6 +20,7 @@
     "coverage": "codecov || exit 0",
     "deep-clean-install": "yarn verdaccio-clean && yarn cache clean && yarn clean && git clean -fdx -e .vscode -e .env && yarn",
     "e2e": "lerna run e2e",
+    "e2e-migration": "lerna run e2e-migration",
     "extract-api": "lerna run extract-api --concurrency 4",
     "extract-formatting-changes": "yarn ts-node ./scripts/extract-formatting-changes.ts",
     "finish-release": "ts-node ./scripts/finish-release.ts",

packages/amplify-app/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.43-next-11.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-app@5.0.42-next-7.0...@aws-amplify/amplify-app@5.0.43-next-11.0) (2025-05-01)
+
+**Note:** Version bump only for package @aws-amplify/amplify-app
+
+
+
+
+
 ## [5.0.42](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-app@5.0.41...@aws-amplify/amplify-app@5.0.42) (2025-04-17)
 
 **Note:** Version bump only for package @aws-amplify/amplify-app

packages/amplify-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-app",
-  "version": "5.0.42",
+  "version": "5.0.43-next-11.0",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -28,8 +28,8 @@
   "dependencies": {
     "@aws-amplify/amplify-frontend-android": "3.5.8",
     "@aws-amplify/amplify-frontend-flutter": "1.4.7",
-    "@aws-amplify/amplify-frontend-ios": "3.7.12",
-    "@aws-amplify/amplify-frontend-javascript": "3.10.22",
+    "@aws-amplify/amplify-frontend-ios": "3.7.13-next-11.0",
+    "@aws-amplify/amplify-frontend-javascript": "3.10.23-next-11.0",
     "chalk": "^4.1.1",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",

packages/amplify-appsync-simulator/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.16.13-next-11.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-appsync-simulator@2.16.12-next-7.0...@aws-amplify/amplify-appsync-simulator@2.16.13-next-11.0) (2025-05-01)
+
+**Note:** Version bump only for package @aws-amplify/amplify-appsync-simulator
+
+
+
+
+
 ## [2.16.12](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-appsync-simulator@2.16.11...@aws-amplify/amplify-appsync-simulator@2.16.12) (2025-04-17)
 
 **Note:** Version bump only for package @aws-amplify/amplify-appsync-simulator

packages/amplify-appsync-simulator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-appsync-simulator",
-  "version": "2.16.12",
+  "version": "2.16.13-next-11.0",
   "description": "An AppSync Simulator to test AppSync API.",
   "repository": {
     "type": "git",
@@ -30,11 +30,11 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1",
+    "@aws-amplify/amplify-cli-core": "4.4.2-next-11.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "@graphql-tools/schema": "^8.3.1",
     "@graphql-tools/utils": "^8.5.1",
-    "amplify-velocity-template": "1.4.15",
+    "amplify-velocity-template": "1.4.16-next-11.0",
     "aws-sdk": "^2.1464.0",
     "chalk": "^4.1.1",
     "cors": "^2.8.5",
@@ -58,7 +58,7 @@
     "ws": "^8.5.0"
   },
   "devDependencies": {
-    "@aws-amplify/amplify-graphiql-explorer": "2.6.1",
+    "@aws-amplify/amplify-graphiql-explorer": "2.6.2-next-11.0",
     "@types/cors": "^2.8.6",
     "@types/express": "^4.17.3",
     "@types/node": "^12.12.6",

packages/amplify-category-analytics/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.42-next-11.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-analytics@5.0.41-next-7.0...@aws-amplify/amplify-category-analytics@5.0.42-next-11.0) (2025-05-01)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-analytics
+
+
+
+
+
 ## [5.0.41](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-analytics@5.0.40...@aws-amplify/amplify-category-analytics@5.0.41) (2025-04-17)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-analytics

packages/amplify-category-analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-analytics",
-  "version": "5.0.41",
+  "version": "5.0.42-next-11.0",
   "description": "amplify-cli analytics plugin",
   "repository": {
     "type": "git",
@@ -25,8 +25,8 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.4.1",
-    "@aws-amplify/amplify-environment-parameters": "1.9.19",
+    "@aws-amplify/amplify-cli-core": "4.4.2-next-11.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.20-next-11.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "fs-extra": "^8.1.0",
     "uuid": "^8.3.2"

packages/amplify-category-auth/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.7.22-next-11.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-auth@3.7.21-next-7.0...@aws-amplify/amplify-category-auth@3.7.22-next-11.0) (2025-05-01)
+
+
+### Bug Fixes
+
+* pin CDK version again ([#14186](https://github.com/aws-amplify/amplify-cli/issues/14186)) ([ef7f5eb](https://github.com/aws-amplify/amplify-cli/commit/ef7f5ebe0136049865554c6ec0235abc9b816fea))
+
+
+
+
+
 ## [3.7.21](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-auth@3.7.20...@aws-amplify/amplify-category-auth@3.7.21) (2025-04-17)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-auth