chore(gen2-migration): e2e fixes (#14771)

* refactor(amplify-gen2-migration-e2e-system): auto-sanitize snapshots and add gen2-migration skill

Move sanitize and snapshot capture logic into the e2e-system
package so that sanitization runs automatically as part of the
E2E flow. Simplify the migration-apps sanitize.ts and snapshot.ts
to delegate to the shared implementation.

Add a gen2-migration development skill with context references
and a development loop for bug fixes and new features.

Minor fixes to gitignore generator and refactor output directory.
---
Prompt: we are working on the gen2-migration skill and e2e
snapshot capture improvements

* docs: refine gen2-migration skill and add E2E step to app workflows

Streamline the gen2-migration skill with structured Context and
Development Loop sections covering bug fix and feature workflows.

Add missing E2E snapshot capture step to "Adding an App" and
"Modifying an App" sections in the migration apps README.
---
Prompt: refine the gen2-migration skill and fix missing E2E step
in migration apps README

* refactor(amplify-gen2-migration-e2e-system): simplify App class

Remove git wrapper methods and call this.git.* directly. Move
migrate() next to the other migration methods. Reorganize class
sections (Tests, Hooks). Filter updateSnapshots to only copy
_snapshot directories.
---
Prompt: commit

* chore: add deploy scripts, fix docs, update PR template

Add deploy npm script to all migration apps. Fix snapshot.ts
usage string and README to match new argument signature. Add
JSDoc to new public members. Update PR template headings to h3.
Update AGENTS.md PR body instructions with grouping guidance.
---
Prompt: add deploy script to all apps, check for outdated
docstrings, update PR template and AGENTS.md

* feat(amplify-gen2-migration-e2e-system): add shared-data validation to e2e refactor flow

Add cross-generation data validation tests that verify stateful
resources (Cognito, AppSync/DynamoDB, S3) are correctly shared
between gen1 and gen2 after migration refactor.

Changes:
- New shared-data.test.ts for discussions app that tests both
  gen1→gen2 and gen2→gen1 data access for auth, API, activity
  tables, and storage.
- Generalize post-refactor script: extract addTableNameToTable
  helper, add bookmarks table support, add uncommentS3BucketName.
- Make configureAmplify() lazy so tests can switch between gen1
  and gen2 configs at runtime.
- Propagate ENV_NAME env var from e2e system to migration scripts
  instead of using default parameter values.
- Add testSharedData step to the e2e deploy phase.
- Make Git.run public so App can cherry-pick files across branches.
---
Prompt: commit everything

* chore(amplify-gen2-migration-e2e-system): add test:shared-data script to all migration apps

Add a no-op test:shared-data script ("true") to every migration app
that doesn't already have one. This ensures the e2e system can
uniformly call the script across all apps without failures. Real
tests will be added per-app later.
---
Prompt: Add a "test:shared-data" script to all migration apps,
have it just be "true" for now, we'll add tests later.

* docs(amplify-gen2-migration-e2e-system): improve skill and app workflow docs

Update gen2-migration SKILL.md to clarify snapshot directory
inspection and to guide the agent to check for existing test app
coverage before fixing a bug. Update amplify-migration-apps
README.md to include validation test steps when adding or
modifying apps, and note that E2E failures require fixing the
bug before snapshots can be captured.
---
Prompt: made more changes. commit.

* feat(amplify-gen2-migration-e2e-system): add mood-board post-push hook and analytics test

Add post-push.ts for mood-board that updates KINESIS_STREAM_NAME
in src/constants.ts to match the deployed environment. Add a
Kinesis record/read test in analytics.test.ts that writes events
and polls getKinesisEvents to verify at least one is readable.
Move the getKinesisEvents parseable JSON test from analytics to
api.test.ts. Fix env name generation to always use length 10.
---
Prompt: made more changes. commit everything.

Author: iliapolo

.kiro/skills/gen2-migration/SKILL.md

@@ -39,15 +39,14 @@ with a specific combination of Amplify categories and configurations. See
 
 ### Fix a Bug
 
-The snapshot inputs (`_snapshot.pre.*`) don't change — only the code and possibly the
-expected outputs (`_snapshot.post.*`) change.
-
 1. Read the relevant Context above for the area you're touching.
 
-2. Analyze the bug by reading the affected app's snapshot files. Read the
-   `_snapshot.pre.generate/` and/or `_snapshot.pre.refactor/` files to understand the
-   input configuration, and the `_snapshot.post.*` files to identify what's wrong in the
-   current output.
+2. Determine whether an existing test app covers the bug's scenario. Read the affected
+   app's `_snapshot.pre.generate/` and/or `_snapshot.pre.refactor/` files to understand
+   the input configuration, and the `_snapshot.post.*` files to identify what's wrong in
+   the current output. If no existing app exercises the affected code path, follow the
+   "Adding an App" or "Modifying an App" instructions from `amplify-migration-apps/README.md`
+   to add or update the `_snapshot.pre.*` inputs before proceeding.
 
 3. Reproduce the bug by running the appropriate E2E test:
 
@@ -56,8 +55,11 @@ expected outputs (`_snapshot.post.*`) change.
    npm run test:e2e
    ```
 
-   After the E2E run, inspect the live Gen1 and Gen2 resources and CloudFormation stack
-   events using the AWS CLI to confirm the root cause.
+   The E2E tool logs the directory where on-the-fly snapshots are captured for this run
+   (look for the `Snapshot directory:` line in the output). You can inspect the files in
+   that directory to see the state of the app at each step. In addition, inspect the live
+   Gen1 and Gen2 resources and CloudFormation stack events using the AWS CLI to confirm
+   the root cause.
 
 4. Present the root cause analysis to the user.
 
@@ -111,6 +113,12 @@ expected outputs (`_snapshot.post.*`) change.
    UPDATE_SNAPSHOTS=1 npm run test:e2e
    ```
 
+   The E2E tool logs the directory where on-the-fly snapshots are captured for this run
+   (look for the `Snapshot directory:` line in the output). You can inspect the files in
+   that directory to see the state of the app at each step. In addition, inspect the live
+   Gen1 and Gen2 resources and CloudFormation stack events using the AWS CLI to confirm
+   correctness.
+
 8. Run `yarn build && yarn test` in `packages/amplify-cli/` to verify nothing else broke.
    If tests fail at this point, only test code changes should be needed — the production
    code was already validated by the E2E run.

amplify-migration-apps/README.md

@@ -293,27 +293,36 @@ Make sure to follow the existing patterns and add tests as well.
 2. Run `amplify init`.
 3. Configure the backend using Gen1 CLI.
 4. Run `amplify push`.
-5. Use the [Snapshot Capture Tool](#snapshot-capture-tool) to capture the `pre.generate` snapshot.
+5. Add validation tests under `<app-name>/tests/` that exercise the new app's capabilities
+   (API queries, auth flows, storage operations, etc.). Follow the patterns in existing apps
+   like `project-boards/tests/` or `fitness-tracker/tests/`.
+6. Use the [Snapshot Capture Tool](#snapshot-capture-tool) to capture the `pre.generate` snapshot.
 
     ```console
     npx tsx snapshot.ts pre.generate <app-name>
 
-6. Run `UPDATE_SNAPSHOTS=1 npm run test:e2e` to execute the full migration flow and capture
-   the remaining snapshots (`post.generate`, `pre.refactor`, `post.refactor`).
+7. Run `UPDATE_SNAPSHOTS=1 npm run test:e2e` to execute the full migration flow and capture
+   the remaining snapshots (`post.generate`, `pre.refactor`, `post.refactor`). The E2E may
+   fail if the new app exercises a bug in the migration tooling. In that case the snapshots
+   will not be updated — fix the bug first, then re-run.
 
 ## Modifying an App
 
 1. `cd` into a specific app and run `npm run deploy`.
 2. Locate the deployed app directory in output logs and `cd` into it.
 3. Update the backend using Gen1 CLI.
 4. Run `amplify push`.
-5. Use the [Snapshot Capture Tool](#snapshot-capture-tool) to capture the `pre.generate` snapshot.
+5. Add or update validation tests under `<app-name>/tests/` to cover the modified
+   capabilities. Follow the patterns in existing apps like `project-boards/tests/`.
+6. Use the [Snapshot Capture Tool](#snapshot-capture-tool) to capture the `pre.generate` snapshot.
 
     ```console
     npx tsx snapshot.ts pre.generate <app-name>
 
-6. Run `UPDATE_SNAPSHOTS=1 npm run test:e2e` to execute the full migration flow and capture
-   the remaining snapshots (`post.generate`, `pre.refactor`, `post.refactor`).
+7. Run `UPDATE_SNAPSHOTS=1 npm run test:e2e` to execute the full migration flow and capture
+   the remaining snapshots (`post.generate`, `pre.refactor`, `post.refactor`). The E2E may
+   fail if the app change exercises a bug in the migration tooling. In that case the
+   snapshots will not be updated — fix the bug first, then re-run.
 
 ## Snapshot Testing
 

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

@@ -12,6 +12,7 @@
     "typecheck": "cd _snapshot.post.generate/amplify && npx tsc --noEmit",
     "test:gen1": "true",
     "test:gen2": "true",
+    "test:shared-data": "true",
     "test:e2e": "cd ../../packages/amplify-gen2-migration-e2e-system && npx tsx src/cli.ts --app backend-only --profile ${AWS_PROFILE:-default}",
     "deploy": "cd ../../packages/amplify-gen2-migration-e2e-system && npx tsx src/cli.ts --app backend-only --step deploy --profile ${AWS_PROFILE:-default}",
     "pre-push": "true",

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

@@ -3,34 +3,61 @@
  * Post-refactor script for discussions app.
  *
  * Applies manual edits required after `amplify gen2-migration refactor`:
- * 1. Add tableName to the DynamoDB table definition in backend.ts
- *    This ensures the refactored table keeps its original name.
+ * 1. Add tableName to the activity DynamoDB table definition in backend.ts
+ * 2. Add tableName to the bookmarks DynamoDB table definition in backend.ts
+ * 3. Uncomment s3Bucket.bucketName to preserve the original bucket name
  */
 
 import fs from 'fs/promises';
 import path from 'path';
 
-async function addTableNameToActivityTable(appPath: string, envName: string): Promise<void> {
+async function addTableNameToTable(
+  appPath: string,
+  stackVar: string,
+  tableId: string,
+  envName: string,
+): Promise<void> {
   const backendPath = path.join(appPath, 'amplify', 'backend.ts');
   const content = await fs.readFile(backendPath, 'utf-8');
 
-  const tableName = `activity-${envName}`;
+  const tableName = `${tableId}-${envName}`;
 
+  // Insert tableName as its own property line after the opening brace,
+  // matching the indentation of the existing partitionKey property.
   const updated = content.replace(
-    /new Table\(storageStack,\s*["']activity["'],\s*\{\s*partitionKey:/g,
-    `new Table(storageStack, "activity", { tableName: "${tableName}", partitionKey:`,
+    new RegExp(
+      `(new Table\\(${stackVar},\\s*["']${tableId}["'],\\s*\\{\\n)(\\s*)(partitionKey:)`,
+    ),
+    `$1$2tableName: '${tableName}',\n$2$3`,
   );
 
   await fs.writeFile(backendPath, updated, 'utf-8');
 }
 
-export async function postRefactor(appPath: string, envName = 'main'): Promise<void> {
-  await addTableNameToActivityTable(appPath, envName);
+async function uncommentS3BucketName(appPath: string): Promise<void> {
+  const backendPath = path.join(appPath, 'amplify', 'backend.ts');
+  const content = await fs.readFile(backendPath, 'utf-8');
+
+  const updated = content.replace(
+    /\/\/\s*(s3Bucket\.bucketName\s*=\s*['"][^'"]+['"];?)/g,
+    '$1',
+  );
+
+  await fs.writeFile(backendPath, updated, 'utf-8');
+}
+
+export async function postRefactor(appPath: string, envName: string): Promise<void> {
+  await addTableNameToTable(appPath, 'storageActivityStack', 'activity', envName);
+  await addTableNameToTable(appPath, 'storageBookmarksStack', 'bookmarks', envName);
+  await uncommentS3BucketName(appPath);
 }
 
 async function main(): Promise<void> {
-  const [appPath = process.cwd(), envName] = process.argv.slice(2);
-  await postRefactor(appPath, envName);
+  const [appPath = process.cwd()] = process.argv.slice(2);
+  if (!process.env.ENV_NAME) {
+    throw new Error(`Missing ENV_NAME env variable`);
+  }
+  await postRefactor(appPath, process.env.ENV_NAME);
 }
 
 main().catch((error) => {

amplify-migration-apps/discussions/package.json

@@ -14,8 +14,9 @@
     "configure-schema": "./backend/configure-schema.sh",
     "sanitize": "tsx ../sanitize.ts",
     "typecheck": "cd _snapshot.post.generate/amplify && npx tsc --noEmit",
-    "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:gen1": "APP_CONFIG_PATH=${APP_CONFIG_PATH:-src/amplifyconfiguration.json} NODE_OPTIONS='--experimental-vm-modules' jest --verbose --testPathIgnorePatterns='shared-data'",
+    "test:gen2": "APP_CONFIG_PATH=${APP_CONFIG_PATH:-amplify_outputs.json} NODE_OPTIONS='--experimental-vm-modules' jest --verbose --testPathIgnorePatterns='shared-data'",
+    "test:shared-data": "NODE_OPTIONS='--experimental-vm-modules' jest --verbose tests/shared-data.test.ts",
     "test:e2e": "cd ../../packages/amplify-gen2-migration-e2e-system && npx tsx src/cli.ts --app discussions --profile ${AWS_PROFILE:-default}",
     "deploy": "cd ../../packages/amplify-gen2-migration-e2e-system && npx tsx src/cli.ts --app discussions --step deploy --profile ${AWS_PROFILE:-default}",
     "pre-push": "true",

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

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { generateClient } from 'aws-amplify/api';
 import { getCurrentUser, signIn, signOut } from 'aws-amplify/auth';
-import { signUp, config } from './signup';
+import { signUp, configureAmplify } from './signup';
 import {
   getTopic, listTopics,
   getPost, listPosts,
@@ -20,6 +20,7 @@ let username: string;
 let password: string;
 
 beforeAll(async () => {
+  const config = configureAmplify();
   const creds = await signUp(config);
   username = creds.username;
   password = creds.password;