fix(cli): gen2-migration lock --rollback reports false drift

amplify-migration-apps/fitness-tracker/migration/config.json

@@ -1,5 +1,5 @@
 {
-  "lock": {
+  "lockForward": {
     "skipValidations": true
   }
 }

amplify-migration-apps/mood-board/_snapshot.pre.generate/amplify/backend/api/moodboard/resolvers/Query.listBoards.res.vtl

@@ -5,8 +5,8 @@
 
 ## Add a pin emoji prefix to each board name so it's visible on the frontend
 #foreach( $item in $ctx.result.items )
-  #if( !$item.name.startsWith("📌 ") )
-    $util.qr($item.put("name", "📌 $item.name"))
+  #if( !$item.name.startsWith("(new!)") )
+    $util.qr($item.put("name", "(new!) $item.name"))
   #end
 #end
 

amplify-migration-apps/mood-board/tests/api.test.ts

@@ -38,7 +38,7 @@ describe('guest', () => {
 
       expect(typeof board.id).toBe('string');
       expect(board.id.length).toBeGreaterThan(0);
-      expect(board.name).toMatch(new RegExp(`^[🌅☀️🌙] ${name} \\(new!\\)$`));
+      expect(board.name).toEqual(`${name} (new!)`);
       expect(board.createdAt).toBeDefined();
       expect(board.updatedAt).toBeDefined();
     });
@@ -106,7 +106,7 @@ describe('guest', () => {
       expect(items.length).toBeGreaterThanOrEqual(1);
       const found = items.find((b: any) => b.id === created.id);
       expect(found).toBeDefined();
-      expect(found.name).toBe(`📌 ${name}`);
+      expect(found.name).toBe(`(new!) ${name}`);
     });
   });
 

amplify-migration-apps/store-locator/migration/config.json

@@ -1,3 +1,4 @@
 {
-  "refactor": { "skipValidations": true }
+  "refactorForward": { "skipValidations": true },
+  "refactorRollback": { "skipValidations": true }
 }

codebuild_specs/e2e_workflow_generated.yml

@@ -1021,6 +1021,15 @@ batch:
           DISABLE_COVERAGE: 1
       depend-on:
         - upb
+    - identifier: l_migrate_finance_tracker
+      buildspec: codebuild_specs/run_e2e_tests_linux.yml
+      env:
+        variables:
+          compute-type: BUILD_GENERAL1_LARGE
+          TEST_SUITE: src/__tests__/gen2-migration/migrate-finance-tracker.test.ts
+          DISABLE_COVERAGE: 1
+      depend-on:
+        - upb
     - identifier: l_migrate_discussions
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
@@ -2286,6 +2295,105 @@ batch:
       depend-on:
         - build_windows
         - upb
+    - identifier: w_migrate_store_locator
+      buildspec: codebuild_specs/run_e2e_tests_windows.yml
+      env:
+        type: WINDOWS_SERVER_2022_CONTAINER
+        image: $WINDOWS_IMAGE_2019
+        variables:
+          TEST_SUITE: src/__tests__/gen2-migration/migrate-store-locator.test.ts
+          DISABLE_COVERAGE: 1
+      depend-on:
+        - build_windows
+        - upb
+    - identifier: w_migrate_project_boards
+      buildspec: codebuild_specs/run_e2e_tests_windows.yml
+      env:
+        type: WINDOWS_SERVER_2022_CONTAINER
+        image: $WINDOWS_IMAGE_2019
+        variables:
+          TEST_SUITE: src/__tests__/gen2-migration/migrate-project-boards.test.ts
+          DISABLE_COVERAGE: 1
+      depend-on:
+        - build_windows
+        - upb
+    - identifier: w_migrate_product_catalog
+      buildspec: codebuild_specs/run_e2e_tests_windows.yml
+      env:
+        type: WINDOWS_SERVER_2022_CONTAINER
+        image: $WINDOWS_IMAGE_2019
+        variables:
+          TEST_SUITE: src/__tests__/gen2-migration/migrate-product-catalog.test.ts
+          DISABLE_COVERAGE: 1
+      depend-on:
+        - build_windows
+        - upb
+    - identifier: w_migrate_mood_board
+      buildspec: codebuild_specs/run_e2e_tests_windows.yml
+      env:
+        type: WINDOWS_SERVER_2022_CONTAINER
+        image: $WINDOWS_IMAGE_2019
+        variables:
+          TEST_SUITE: src/__tests__/gen2-migration/migrate-mood-board.test.ts
+          DISABLE_COVERAGE: 1
+      depend-on:
+        - build_windows
+        - upb
+    - identifier: w_migrate_media_vault
+      buildspec: codebuild_specs/run_e2e_tests_windows.yml
+      env:
+        type: WINDOWS_SERVER_2022_CONTAINER
+        image: $WINDOWS_IMAGE_2019
+        variables:
+          TEST_SUITE: src/__tests__/gen2-migration/migrate-media-vault.test.ts
+          DISABLE_COVERAGE: 1
+      depend-on:
+        - build_windows
+        - upb
+    - identifier: w_migrate_fitness_tracker
+      buildspec: codebuild_specs/run_e2e_tests_windows.yml
+      env:
+        type: WINDOWS_SERVER_2022_CONTAINER
+        image: $WINDOWS_IMAGE_2019
+        variables:
+          TEST_SUITE: src/__tests__/gen2-migration/migrate-fitness-tracker.test.ts
+          DISABLE_COVERAGE: 1
+      depend-on:
+        - build_windows
+        - upb
+    - identifier: w_migrate_finance_tracker
+      buildspec: codebuild_specs/run_e2e_tests_windows.yml
+      env:
+        type: WINDOWS_SERVER_2022_CONTAINER
+        image: $WINDOWS_IMAGE_2019
+        variables:
+          TEST_SUITE: src/__tests__/gen2-migration/migrate-finance-tracker.test.ts
+          DISABLE_COVERAGE: 1
+      depend-on:
+        - build_windows
+        - upb
+    - identifier: w_migrate_discussions
+      buildspec: codebuild_specs/run_e2e_tests_windows.yml
+      env:
+        type: WINDOWS_SERVER_2022_CONTAINER
+        image: $WINDOWS_IMAGE_2019
+        variables:
+          TEST_SUITE: src/__tests__/gen2-migration/migrate-discussions.test.ts
+          DISABLE_COVERAGE: 1
+      depend-on:
+        - build_windows
+        - upb
+    - identifier: w_migrate_backend_only
+      buildspec: codebuild_specs/run_e2e_tests_windows.yml
+      env:
+        type: WINDOWS_SERVER_2022_CONTAINER
+        image: $WINDOWS_IMAGE_2019
+        variables:
+          TEST_SUITE: src/__tests__/gen2-migration/migrate-backend-only.test.ts
+          DISABLE_COVERAGE: 1
+      depend-on:
+        - build_windows
+        - upb
     - identifier: w_js_frontend_config
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:

codebuild_specs/wait_for_ids.json

@@ -85,6 +85,7 @@
   "l_js_frontend_config",
   "l_migrate_backend_only",
   "l_migrate_discussions",
+  "l_migrate_finance_tracker",
   "l_migrate_fitness_tracker",
   "l_migrate_media_vault",
   "l_migrate_mood_board",
@@ -208,6 +209,15 @@
   "w_init_f_init_d",
   "w_js_frontend_config",
   "w_layer_3_hosting",
+  "w_migrate_backend_only",
+  "w_migrate_discussions",
+  "w_migrate_finance_tracker",
+  "w_migrate_fitness_tracker",
+  "w_migrate_media_vault",
+  "w_migrate_mood_board",
+  "w_migrate_product_catalog",
+  "w_migrate_project_boards",
+  "w_migrate_store_locator",
   "w_minify_cloudformation_init_force_push",
   "w_model_migration_schema_auth_5c",
   "w_notifications_analytics_compatibility_in_app_2_init_e",

packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/auth/auth.generator.test.ts

@@ -2091,8 +2091,9 @@ describe('AuthGenerator', () => {
     jest.spyOn(gen1App.aws, 'fetchUserPool').mockResolvedValue({
       SchemaAttributes: [
         { Name: 'email', Required: true, Mutable: true },
+        { Name: 'address', Required: true, Mutable: false },
         { Name: 'birthdate', Required: false, Mutable: true },
-        { Name: 'address', Required: false, Mutable: true },
+        { Name: 'given_name', Required: false, Mutable: false },
       ],
     });
     jest.spyOn(gen1App.aws, 'fetchMfaConfig').mockResolvedValue({});
@@ -2103,14 +2104,11 @@ describe('AuthGenerator', () => {
       IdentityPoolName: 'test-pool',
       AllowUnauthenticatedIdentities: false,
     });
-    jest.spyOn(gen1App.aws, 'fetchUserPoolClient').mockImplementation((_poolId: string, clientId: string) => {
-      if (clientId === 'webclient123') return Promise.resolve({});
-      return Promise.resolve({
-        RefreshTokenValidity: 30,
-        EnableTokenRevocation: true,
-        ReadAttributes: ['birthdate', 'email'],
-        WriteAttributes: ['address', 'email'],
-      });
+    jest.spyOn(gen1App.aws, 'fetchUserPoolClient').mockResolvedValue({
+      RefreshTokenValidity: 30,
+      EnableTokenRevocation: true,
+      ReadAttributes: ['birthdate', 'email', 'given_name', 'address'],
+      WriteAttributes: ['address', 'email'],
     });
 
     const generator = new AuthGenerator(gen1App, backendGenerator, outputDir, authResource, logger);
@@ -2131,13 +2129,9 @@ describe('AuthGenerator', () => {
             required: true,
             mutable: true,
           },
-          birthdate: {
-            required: false,
-            mutable: true,
-          },
           address: {
-            required: false,
-            mutable: true,
+            required: true,
+            mutable: false,
           },
         },
         multifactor: {
@@ -2162,6 +2156,8 @@ describe('AuthGenerator', () => {
           readAttributes: new ClientAttributes().withStandardAttributes({
             birthdate: true,
             email: true,
+            givenName: true,
+            address: true,
           }),
           writeAttributes: new ClientAttributes().withStandardAttributes({
             address: true,