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

amplify-migration-apps/README.md

@@ -27,7 +27,8 @@ Each app directory follows this layout:
 │   ├── config.json                   # E2E system configuration (optional)
 │   ├── post-generate.ts              # Fixups after gen2-migration generate
 │   ├── post-push.ts                  # Fixups after amplify push (optional)
-│   └── post-refactor.ts              # Fixups after gen2-migration refactor
+│   ├── post-refactor.ts              # Fixups after gen2-migration refactor
+│   └── post-rollback.ts             # Reverses post-refactor fixups after rollback (optional)
 ├── tests/                            # Jest test suites for validating deployed stacks
 │   ├── signup.ts                     # Cognito user provisioning (app-specific)
 │   ├── jest.setup.ts                 # Jest setup (retry config)
@@ -60,17 +61,34 @@ caller's working directory.
 ### `migration/config.json`
 
 Configuration file read by the [E2E system](../packages/amplify-e2e-gen2-migration/) at runtime.
-Currently supports:
+Each key corresponds to a migration step and accepts a `StepConfig` object:
 
 ```json
 {
-  "lock": { "skipValidations": true }
+  "lockForward": { "skipValidations": true },
+  "lockRollback": { "skipValidations": false },
+  "refactorForward": { "skip": true },
+  "refactorRollback": { "skipValidations": true },
+  "generate": { "skipValidations": true }
 }
 ```
 
-- `lock.skipValidations` — pass `--skip-validations` to `gen2-migration lock`.
+| Field              | Type         | Description                                                  |
+| ------------------ | ------------ | ------------------------------------------------------------ |
+| `lockForward`      | `StepConfig` | Config for `gen2-migration lock`.                            |
+| `lockRollback`     | `StepConfig` | Config for `gen2-migration lock --rollback`.                 |
+| `refactorForward`  | `StepConfig` | Config for `gen2-migration refactor`.                        |
+| `refactorRollback` | `StepConfig` | Config for `gen2-migration refactor --rollback`.             |
+| `generate`         | `StepConfig` | Config for `gen2-migration generate`.                        |
 
-If the file does not exist, defaults are used (no skip-validations).
+`StepConfig` fields:
+
+| Field              | Type      | Description                                        |
+| ------------------ | --------- | -------------------------------------------------- |
+| `skipValidations`  | `boolean` | Pass `--skip-validations` to the step.             |
+| `skip`             | `boolean` | Skip the step entirely.                            |
+
+If the file does not exist, defaults are used (no skips, no skip-validations).
 
 ### `tests/`
 
@@ -104,6 +122,18 @@ If a script does not exist for an app, the E2E system silently skips the step.
 > Some apps don't have `_snapshot.post.refactor/` because refactor doesn't work
 > for them yet.
 
+### `migration/post-rollback.ts`
+
+Optional script that reverses the fixups applied by `post-refactor.ts` after a
+`gen2-migration refactor --rollback`. For example, if `post-refactor.ts` uncomments
+a function call in `amplify/backend.ts`, `post-rollback.ts` comments it back.
+
+```typescript
+export async function postRollback(appPath: string): Promise<void>;
+```
+
+If a script does not exist for an app, the E2E system silently skips the step.
+
 ### `migration/pre-push.ts` and `migration/post-sandbox.ts`
 
 Optional scripts for additional lifecycle hooks:

amplify-migration-apps/backend-only/migration/post-rollback.ts

@@ -0,0 +1,33 @@
+#!/usr/bin/env npx ts-node
+/**
+ * Post-rollback script for backend-only app.
+ *
+ * Reverses the manual edits applied by post-refactor:
+ * 1. Comment back the postRefactor() call in amplify/backend.ts
+ */
+
+import fs from 'fs/promises';
+import path from 'path';
+
+async function commentPostRefactorCall(appPath: string): Promise<void> {
+  const backendPath = path.join(appPath, 'amplify', 'backend.ts');
+  let content = await fs.readFile(backendPath, 'utf-8');
+
+  content = content.replace(/^(\s*)(postRefactor\(\);?)$/m, '$1// $2');
+
+  await fs.writeFile(backendPath, content, 'utf-8');
+}
+
+export async function postRollback(appPath: string): Promise<void> {
+  await commentPostRefactorCall(appPath);
+}
+
+async function main(): Promise<void> {
+  const [appPath = process.cwd()] = process.argv.slice(2);
+  await postRollback(appPath);
+}
+
+main().catch((error) => {
+  console.error('Fatal error:', error.message);
+  process.exit(1);
+});

amplify-migration-apps/backend-only/package.json

@@ -19,6 +19,7 @@
     "pre-push": "true",
     "post-generate": "npx tsx migration/post-generate.ts",
     "post-refactor": "npx tsx migration/post-refactor.ts",
+    "post-rollback": "npx tsx migration/post-rollback.ts",
     "post-sandbox": "true",
     "pre-sandbox": "true",
     "post-push": "true"

amplify-migration-apps/discussions/migration/post-rollback.ts

@@ -0,0 +1,33 @@
+#!/usr/bin/env npx ts-node
+/**
+ * Post-rollback script for discussions app.
+ *
+ * Reverses the manual edits applied by post-refactor:
+ * 1. Comment back the postRefactor() call in amplify/backend.ts
+ */
+
+import fs from 'fs/promises';
+import path from 'path';
+
+async function commentPostRefactorCall(appPath: string): Promise<void> {
+  const backendPath = path.join(appPath, 'amplify', 'backend.ts');
+  let content = await fs.readFile(backendPath, 'utf-8');
+
+  content = content.replace(/^(\s*)(postRefactor\(\);?)$/m, '$1// $2');
+
+  await fs.writeFile(backendPath, content, 'utf-8');
+}
+
+export async function postRollback(appPath: string): Promise<void> {
+  await commentPostRefactorCall(appPath);
+}
+
+async function main(): Promise<void> {
+  const [appPath = process.cwd()] = process.argv.slice(2);
+  await postRollback(appPath);
+}
+
+main().catch((error) => {
+  console.error('Fatal error:', error.message);
+  process.exit(1);
+});

amplify-migration-apps/discussions/package.json

@@ -24,6 +24,7 @@
     "pre-push": "true",
     "post-generate": "npx tsx migration/post-generate.ts",
     "post-refactor": "npx tsx migration/post-refactor.ts",
+    "post-rollback": "npx tsx migration/post-rollback.ts",
     "post-sandbox": "true",
     "pre-sandbox": "true",
     "post-push": "true"

amplify-migration-apps/discussions/tests/api.test.ts

@@ -116,7 +116,7 @@ describe('Topic', () => {
     });
     const created = (createResult as any).data.createTopic;
 
-    const listResult = await client().graphql({ query: listTopics });
+    const listResult = await client().graphql({ query: listTopics, variables: { limit: 1000 } });
     const items = (listResult as any).data.listTopics.items;
 
     expect(Array.isArray(items)).toBe(true);
@@ -226,7 +226,7 @@ describe('Post', () => {
     });
     const created = (createResult as any).data.createPost;
 
-    const listResult = await client().graphql({ query: listPosts });
+    const listResult = await client().graphql({ query: listPosts, variables: { limit: 1000 } });
     const items = (listResult as any).data.listPosts.items;
 
     expect(Array.isArray(items)).toBe(true);
@@ -342,7 +342,7 @@ describe('Comment', () => {
     });
     const created = (createResult as any).data.createComment;
 
-    const listResult = await client().graphql({ query: listComments });
+    const listResult = await client().graphql({ query: listComments, variables: { limit: 1000 } });
     const items = (listResult as any).data.listComments.items;
 
     expect(Array.isArray(items)).toBe(true);

amplify-migration-apps/finance-tracker/_snapshot.post.generate/amplify/custom/customresolver/construct.ts

@@ -54,7 +54,8 @@ export class Customresolver extends Construct {
       ":category": $util.dynamodb.toDynamoDBJson($ctx.args.category)
     }
   },
-  "limit": $limit
+  "limit": $limit,
+  "consistentRead": true
 }`;
         // Response mapping template
         const responseTemplate = `

amplify-migration-apps/finance-tracker/_snapshot.pre.generate/amplify/backend/custom/customresolver/cdk-stack.ts

@@ -74,7 +74,8 @@ export class cdkStack extends cdk.Stack {
       ":category": $util.dynamodb.toDynamoDBJson($ctx.args.category)
     }
   },
-  "limit": $limit
+  "limit": $limit,
+  "consistentRead": true
 }`;
 
     // Response mapping template

amplify-migration-apps/finance-tracker/backend/customresolver.ts

@@ -74,7 +74,8 @@ export class cdkStack extends cdk.Stack {
       ":category": $util.dynamodb.toDynamoDBJson($ctx.args.category)
     }
   },
-  "limit": $limit
+  "limit": $limit,
+  "consistentRead": true
 }`;
 
     // Response mapping template

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

@@ -1,4 +1,3 @@
 {
-  "refactor": { "skip": true },
   "generate": { "skipValidations": true }
 }

amplify-migration-apps/finance-tracker/package.json

@@ -15,12 +15,13 @@
     "pre-push": "npx tsx migration/pre-push.ts",
     "post-generate": "npx tsx migration/post-generate.ts",
     "post-refactor": "true",
+    "post-rollback": "true",
     "post-sandbox": "true",
     "pre-sandbox": "true",
     "post-push": "true",
     "test:gen1": "APP_CONFIG_PATH=${APP_CONFIG_PATH:-src/amplifyconfiguration.json} NODE_OPTIONS='--experimental-vm-modules' jest --verbose",
     "test:gen2": "APP_CONFIG_PATH=${APP_CONFIG_PATH:-amplify_outputs.json} NODE_OPTIONS='--experimental-vm-modules' jest --verbose",
-    "test:shared-data": "true",
+    "test:shared": "true",
     "test:e2e": "cd ../../packages/amplify-e2e-gen2-migration && npx tsx src/cli.ts --app finance-tracker --profile ${AWS_PROFILE:-default}",
     "deploy": "cd ../../packages/amplify-e2e-gen2-migration && npx tsx src/cli.ts --app finance-tracker --step deploy --profile ${AWS_PROFILE:-default}"
   },